diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index d7b89b57fe..87f99b5986 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -690,10 +690,6 @@ static void updateFlags() {
 	engine->outputChannels.launchTriggered = engine->launchController.isLaunchCondition;
 #endif
 
-	engine->outputChannels.clutchUpState = engine->clutchUpState;
-	engine->outputChannels.clutchDownState = engine->clutchDownState;
-	engine->outputChannels.brakePedalState = engine->brakePedalState;
-
 #if EFI_PROD_CODE
 	engine->outputChannels.isTriggerError = isTriggerErrorNow();
 #endif // EFI_PROD_CODE
diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 614cdd0a05..c1b4e0038b 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -309,7 +309,7 @@ void Engine::updateSwitchInputs() {
 #if EFI_GPIO_HARDWARE
 	// this value is not used yet
 	if (isBrainPinValid(engineConfiguration->clutchDownPin)) {
-		engine->clutchDownState = engineConfiguration->clutchDownPinInverted ^ efiReadPin(engineConfiguration->clutchDownPin);
+		engine->engineState.clutchDownState = engineConfiguration->clutchDownPinInverted ^ efiReadPin(engineConfiguration->clutchDownPin);
 	}
 	if (hasAcToggle()) {
 		bool result = getAcToggle();
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index c29787c350..5213a5ca63 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -363,7 +363,6 @@ public:
 	void updateTriggerWaveform();
 
 	bool clutchUpState = false;
-	bool clutchDownState = false;
 	bool brakePedalState = false;
 
 	bool isRunningPwmTest = false;
diff --git a/firmware/controllers/algo/launch_control.cpp b/firmware/controllers/algo/launch_control.cpp
index a863404601..1841b8dc31 100644
--- a/firmware/controllers/algo/launch_control.cpp
+++ b/firmware/controllers/algo/launch_control.cpp
@@ -34,7 +34,7 @@ bool LaunchControlBase::isInsideSwitchCondition() {
 		return launchActivatePinState;
 	} else if (isClutchActivated) {
 		if (isBrainPinValid(engineConfiguration->clutchDownPin)) {
-			return engine->clutchDownState;
+			return engine->engineState.clutchDownState;
 		} else {
 			return false;
 		}
@@ -113,10 +113,6 @@ void LaunchControlBase::update() {
 		// If conditions are met...
 		isLaunchCondition = m_launchTimer.hasElapsedSec(engineConfiguration->launchActivateDelay);
 	}
-
-#if EFI_TUNER_STUDIO
-	engine->outputChannels.clutchDownState = engine->clutchDownState;
-#endif /* EFI_TUNER_STUDIO */
 }
 
 bool LaunchControlBase::isLaunchRpmRetardCondition() const {
diff --git a/firmware/controllers/lua/lua_hooks.cpp b/firmware/controllers/lua/lua_hooks.cpp
index 62fae03a2a..5ffb716a3e 100644
--- a/firmware/controllers/lua/lua_hooks.cpp
+++ b/firmware/controllers/lua/lua_hooks.cpp
@@ -302,7 +302,7 @@ static int lua_getDigital(lua_State* l) {
 	bool state = false;
 
 	switch (idx) {
-		case 0: state = engine->clutchDownState; break;
+		case 0: state = engine->engineState.clutchDownState; break;
 		case 1: state = engine->clutchUpState; break;
 		case 2: state = engine->brakePedalState; break;
 		case 3: state = engine->module<AcController>().unmock().acButtonState; break;
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index f5a4564e17..692470521f 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -131,7 +131,7 @@ void printConfiguration(const engine_configuration_s *engineConfiguration) {
 	efiPrintf("clutchUp@%s: %s", hwPortname(engineConfiguration->clutchUpPin),
 			boolToString(engine->clutchUpState));
 	efiPrintf("clutchDown@%s: %s", hwPortname(engineConfiguration->clutchDownPin),
-			boolToString(engine->clutchDownState));
+			boolToString(engine->engineState.clutchDownState));
 
 	efiPrintf("digitalPotentiometerSpiDevice %d", engineConfiguration->digitalPotentiometerSpiDevice);