diff --git a/firmware/config/engines/honda_600.cpp b/firmware/config/engines/honda_600.cpp
index 4f4bfe83c8..9de4864f1d 100644
--- a/firmware/config/engines/honda_600.cpp
+++ b/firmware/config/engines/honda_600.cpp
@@ -47,7 +47,7 @@ static void setDefaultCustomMaps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 
 void setHonda600(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
-	engineConfiguration->trigger.type = TT_HONDA_CBR_600_CUSTOM;
+	engineConfiguration->trigger.type = TT_HONDA_CBR_600;
 	engineConfiguration->fuelAlgorithm = LM_ALPHA_N;
 
 	// upside down wiring
diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index 2721491481..4eb9a60ac5 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -1311,8 +1311,8 @@ case TT_HONDA_ACCORD_1_24_SHIFTED:
   return "TT_HONDA_ACCORD_1_24_SHIFTED";
 case TT_HONDA_CBR_600:
   return "TT_HONDA_CBR_600";
-case TT_HONDA_CBR_600_CUSTOM:
-  return "TT_HONDA_CBR_600_CUSTOM";
+case TT_UNUSED_30:
+  return "TT_UNUSED_30";
 case TT_HONDA_K_12_1:
   return "TT_HONDA_K_12_1";
 case TT_JEEP_18_2_2_2:
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 8d7a11fd61..e20ac3b6a4 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -218,7 +218,7 @@ typedef enum {
 	TT_UNUSED_42 = 42,
 
 	TT_TOOTHED_WHEEL = TT_TT_TOOTHED_WHEEL,
-	TT_FORD_ASPIRE = 1,
+	TT_FORD_ASPIRE = TT_TT_FORD_ASPIRE,
 	TT_DODGE_NEON_1995 = 2,
 	/**
 	 * https://rusefi.com/wiki/index.php?title=Manual:Software:Trigger#Mazda_Miata_NA
@@ -237,7 +237,8 @@ typedef enum {
 	TT_TOOTHED_WHEEL_60_2 = TT_TT_TOOTHED_WHEEL_60_2,
 	TT_TOOTHED_WHEEL_36_1 = TT_TT_TOOTHED_WHEEL_36_1,
 
-	TT_HONDA_4_24_1 = 10,
+	// todo: remove this weird trigger?
+	TT_HONDA_4_24_1 = TT_TT_HONDA_4_24_1,
 
 	// todo: this really looks to be same as Miata_NA shall we remove?
 	TT_MITSUBISHI = 11,
@@ -245,7 +246,7 @@ typedef enum {
 	// this makes sense because mechanical spark distribution does not require synchronization
 	TT_HONDA_4_24 = 12,
 
-	TT_HONDA_1_4_24 = 13,
+	TT_HONDA_1_4_24 = TT_TT_HONDA_1_4_24,
 
 	// cam-based
 	TT_DODGE_NEON_2003_CAM = 14,
@@ -269,7 +270,7 @@ typedef enum {
 	 */
 	TT_60_2_VW = TT_TT_60_2_VW,
 
-	TT_HONDA_1_24 = 21,
+	TT_HONDA_1_24 = TT_TT_HONDA_1_24,
 
 	TT_DODGE_STRATUS = 22,
 
@@ -292,7 +293,7 @@ typedef enum {
 
 	TT_2JZ_1_12 = TT_TT_2JZ_1_12,
 
-	TT_HONDA_CBR_600_CUSTOM = 30,
+	TT_UNUSED_30 = 30,
 
 	// skipped 3/1 with cam sensor for testing
 	TT_3_1_CAM = 31,
@@ -350,9 +351,9 @@ typedef enum {
 	 */
 	TT_RENIX_66_2_2_2 = TT_TT_RENIX_66_2_2_2,
 
-	TT_HONDA_K_12_1 = 46,
+	TT_HONDA_K_12_1 = TT_TT_HONDA_K_12_1,
 
-	TT_VVT_BOSCH_QUICK_START = 47,
+	TT_VVT_BOSCH_QUICK_START = TT_TT_VVT_BOSCH_QUICK_START,
 
 	TT_TOOTHED_WHEEL_36_2 = TT_TT_TOOTHED_WHEEL_36_2,
 
diff --git a/firmware/controllers/trigger/decoders/trigger_honda.cpp b/firmware/controllers/trigger/decoders/trigger_honda.cpp
index 91e8fcecda..27074645ad 100644
--- a/firmware/controllers/trigger/decoders/trigger_honda.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_honda.cpp
@@ -209,80 +209,6 @@ void configureHondaCbr600(TriggerWaveform *s) {
 	s->addEvent720(720.0f, T_PRIMARY, TV_RISE);
 }
 
-void configureHondaCbr600custom(TriggerWaveform *s) {
-
-	// w = 15
-	float w = 720 / 2 / 24;
-//	s->initialize(FOUR_STROKE_CAM_SENSOR);
-	s->initialize(FOUR_STROKE_CAM_SENSOR);
-
-	s->useOnlyPrimaryForSync = true;
-	s->isSynchronizationNeeded = true;
-	s->setTriggerSynchronizationGap2(0.7, 1.1);
-
-
-	float a = 0;
-
-	a += w;
-	s->addEvent720(a, T_SECONDARY, TV_RISE);
-	a += w;
-	s->addEvent720(a - 1, T_SECONDARY, TV_FALL); // 30
-
-	a += w;
-	s->addEvent720(a, T_SECONDARY, TV_RISE);
-	s->addEvent720(52.4, T_PRIMARY, TV_FALL);
-	a += w;
-	s->addEvent720(a - 1, T_SECONDARY, TV_FALL); // 60
-
-	for (int i = 0;i<10;i++) {
-		a += w;
-		s->addEvent720(a, T_SECONDARY, TV_RISE);
-		a += w;
-		s->addEvent720(a, T_SECONDARY, TV_FALL);
-	}
-
-	a += w;
-	s->addEvent720(a, T_SECONDARY, TV_RISE);
-
-	s->addEvent720(381.34f, T_PRIMARY, TV_RISE);
-
-	a += w;
-	s->addEvent720(a - 1, T_SECONDARY, TV_FALL);
-
-	for (int i = 0;i<1;i++) {
-		a += w;
-		s->addEvent720(a, T_SECONDARY, TV_RISE);
-		a += w;
-		s->addEvent720(a, T_SECONDARY, TV_FALL);
-	}
-
-	a += w;
-	s->addEvent720(a, T_SECONDARY, TV_RISE);
-
-
-	s->addEvent720(449.1f, T_PRIMARY, TV_FALL);
-
-	a += w;
-	s->addEvent720(a, T_SECONDARY, TV_FALL);
-
-
-	for (int i = 0;i<8;i++) {
-		a += w;
-		s->addEvent720(a, T_SECONDARY, TV_RISE);
-		a += w;
-		s->addEvent720(a, T_SECONDARY, TV_FALL);
-	}
-
-	a += w;
-	s->addEvent720(a, T_SECONDARY, TV_RISE);
-	a += w;
-	s->addEvent720(a - 1, T_SECONDARY, TV_FALL);
-
-
-	s->addEvent720(720.0f, T_PRIMARY, TV_RISE);
-
-}
-
 void configureHondaAccordShifted(TriggerWaveform *s) {
 	s->initialize(FOUR_STROKE_CAM_SENSOR);
 
diff --git a/firmware/controllers/trigger/decoders/trigger_honda.h b/firmware/controllers/trigger/decoders/trigger_honda.h
index 83a7ef5102..3e825b1530 100644
--- a/firmware/controllers/trigger/decoders/trigger_honda.h
+++ b/firmware/controllers/trigger/decoders/trigger_honda.h
@@ -20,8 +20,5 @@ void configureHonda_1_4_24(TriggerWaveform *s, bool withOneEventSignal, bool wit
 void configureOnePlus16(TriggerWaveform *s);
 
 void configureHondaCbr600(TriggerWaveform *s);
-void configureHondaCbr600custom(TriggerWaveform *s);
 
 void configureHondaK_12_1(TriggerWaveform *s);
-
-
diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp
index f5d2f50fe5..63ef753392 100644
--- a/firmware/controllers/trigger/decoders/trigger_structure.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp
@@ -601,10 +601,7 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_
 		configureHondaCbr600(this);
 		break;
 
-	case TT_HONDA_CBR_600_CUSTOM:
-		configureHondaCbr600custom(this);
-		break;
-
+	case TT_UNUSED_30:
 	case TT_MITSUBISHI:
 		initializeMitsubishi4g18(this);
 		break;
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 2529af4bdc..e5174be4c0 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -402,6 +402,7 @@ end_struct
 #define TT_TT_HONDA_1_24 21
 #define TT_TT_36_2_2_2 23
 #define TT_TT_2JZ_3_34 25
+#define TT_TT_ROVER_K 26
 #define TT_TT_GM_LS_24 27
 #define TT_TT_HONDA_CBR_600 28
 #define TT_TT_2JZ_1_12 29
@@ -415,6 +416,7 @@ end_struct
 #define TT_TT_VVT_BOSCH_QUICK_START 47
 #define TT_TT_TOOTHED_WHEEL_36_2 48
 #define TT_TT_SUBARU_SVX 49
+#define TT_TT_1_16 50
 
 #define ET_DODGE_NEON_1995 2
 #define ET_FORD_ASPIRE 3