diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp
index 8efadd76ee..dc102fac59 100644
--- a/firmware/config/engines/dodge_neon.cpp
+++ b/firmware/config/engines/dodge_neon.cpp
@@ -387,7 +387,5 @@ void setDodgeNeonNGCEngineConfiguration() {
 
 	engineConfiguration->slowAdcAlpha = 0.33333;
 
-	engineConfiguration->isCylinderCleanupEnabled = true;
-
 	// end of setDodgeNeonNGCEngineConfiguration
 }
diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp
index 59f8a8beab..c61c447b15 100644
--- a/firmware/config/engines/mazda_miata_vvt.cpp
+++ b/firmware/config/engines/mazda_miata_vvt.cpp
@@ -276,8 +276,6 @@ static void setCommonMazdaNB() {
 #if IGN_LOAD_COUNT == DEFAULT_IGN_LOAD_COUNT
 	copyTable(config->ignitionTable, mapBased18vvtTimingTable);
 #endif
-	// enable cylinder_cleanup
-	engineConfiguration->isCylinderCleanupEnabled = true;
 	// set_whole_ve_map 80
 	setMazdaMiataNbInjectorLag();
 
diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp
index 9503eb7dda..3eb9ebc69f 100644
--- a/firmware/config/engines/me7pnp.cpp
+++ b/firmware/config/engines/me7pnp.cpp
@@ -33,7 +33,6 @@ void vag_18_Turbo() {
 	engineConfiguration->injectionMode = IM_SEQUENTIAL;
 	engineConfiguration->ignitionPinMode = OM_INVERTED;
 	engineConfiguration->injectionPinMode = OM_OPENDRAIN_INVERTED;
-	engineConfiguration->isCylinderCleanupEnabled = true;
 	engineConfiguration->rpmHardLimit = 8000;
 	engineConfiguration->cranking.baseFuel = 28;
 
diff --git a/firmware/config/engines/vw.cpp b/firmware/config/engines/vw.cpp
index 24cc1b64a0..8406f0a835 100644
--- a/firmware/config/engines/vw.cpp
+++ b/firmware/config/engines/vw.cpp
@@ -21,8 +21,6 @@ void setVwAba() {
 	// set cranking_timing_angle 10
 	engineConfiguration->crankingTimingAngle = 10;
 
-	engineConfiguration->isCylinderCleanupEnabled = true;
-
 	// set global_trigger_offset_angle 93
 	engineConfiguration->globalTriggerAngleOffset = 93;
 
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 89c87a4c13..272a865667 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -480,6 +480,8 @@ static void setDefaultEngineConfiguration() {
 
 	engineConfiguration->vvtOutputFrequency[0] = 300; // VVT solenoid control
 
+	engineConfiguration->isCylinderCleanupEnabled = true;
+
 	engineConfiguration->auxPid[1].minValue = 10;
 	engineConfiguration->auxPid[1].maxValue = 90;