diff --git a/firmware/config/engines/mazda_miata_vvt.h b/firmware/config/engines/mazda_miata_vvt.h
index 23ca7fa6b6..ecb1a992d1 100644
--- a/firmware/config/engines/mazda_miata_vvt.h
+++ b/firmware/config/engines/mazda_miata_vvt.h
@@ -11,9 +11,6 @@
 
 #include "engine_configuration.h"
 
-void setMazdaMiataNbInjectorLag();
-void setMazdaNB2VVTSettings();
-
 /**
  * Primary rusEfi test mule https://rusefi.com/forum/viewtopic.php?f=3&t=1095
  * MAZDA_MIATA_2003
@@ -26,20 +23,6 @@ void setMazdaMiata2003EngineConfiguration();
 void setMazdaMiata2003EngineConfigurationNaFuelRail();
 void setMazdaMiata2003EngineConfigurationBoardTest();
 
-void setMiataNB2_MRE_ETB();
-
-/**
- * OEM mechanical throttle body, with MAP
- * set engine_type 11
- */
-void setMiataNB2_MRE_MAP();
-
-/**
- * OEM mechanical throttle body using OEM MAF
- * set engine_type 15
- */
-void setMiataNB2_MRE_MAF();
-
 /**
  * https://github.com/rusefi/rusefi/wiki/Mazda-Miata-2001
  * set engine_type 1
@@ -49,7 +32,7 @@ void setMiataNB2_Proteus_TCU();
 /**
  * set engine_type 67
  */
-void setMiataNB2_ProteusEngineConfiguration();
+void setMiataNB2_Proteus();
 
 /**
  * set engine_type 69
diff --git a/firmware/config/engines/toyota_jzs147.cpp b/firmware/config/engines/toyota_jzs147.cpp
index 6ec21fd6e7..c612333f95 100644
--- a/firmware/config/engines/toyota_jzs147.cpp
+++ b/firmware/config/engines/toyota_jzs147.cpp
@@ -98,9 +98,4 @@ void setToyota_2jz_vics() {
 	//	engineConfiguration->scriptSetting[5] = 175 + 45;
 
 	engineConfiguration->vvtPins[0] = Gpio::E3; // VVT solenoid control
-
-	// Mazda VVT settings have nothing to do wit Toyota 2JZ settings but those are a good starting point for settings
-	setMazdaNB2VVTSettings();
 }
-
-
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index e02496c1ee..01898a0268 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -750,15 +750,6 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
 	case MRE_MIATA_NA6_MAP:
 		setMiataNA6_MAP_MRE();
 		break;
-	case MRE_MIATA_NB2_MAP:
-		setMiataNB2_MRE_MAP();
-		break;
-	case MRE_MIATA_NB2_MAF:
-		setMiataNB2_MRE_MAF();
-		break;
-	case MRE_MIATA_NB2_ETB:
-		setMiataNB2_MRE_ETB();
-		break;
 	case MRE_BODY_CONTROL:
 		mreBCM();
 		break;
@@ -809,7 +800,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
 	case PROTEUS_VAG_80_18T:
 	case PROTEUS_N73:
 	case PROTEUS_MIATA_NB2:
-		setMiataNB2_ProteusEngineConfiguration();
+		setMiataNB2_Proteus();
 		break;
 	case PROTEUS_SBC:
 	    setProteusSbc();
diff --git a/unit_tests/tests/trigger/test_cam_vvt_input.cpp b/unit_tests/tests/trigger/test_cam_vvt_input.cpp
index 23577180a3..02956df2e0 100644
--- a/unit_tests/tests/trigger/test_cam_vvt_input.cpp
+++ b/unit_tests/tests/trigger/test_cam_vvt_input.cpp
@@ -156,21 +156,21 @@ TEST(trigger, testNB2CamInput) {
 
 	eth.moveTimeForwardUs(MS2US(3)); // shifting VVT phase a few angles
 
-	hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0);
+	hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
 
 	// first gap - long
 
 	eth.moveTimeForwardUs(MS2US(130));
-	hwHandleVvtCamSignal(TriggerValue::FALL, getTimeNowNt(), 0);
+	hwHandleVvtCamSignal(false, getTimeNowNt(), 0);
 	eth.moveTimeForwardUs(MS2US( 30));
-	hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0);
+	hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
 
 	// second gap - short
 
 	eth.moveTimeForwardUs(MS2US(10));
-	hwHandleVvtCamSignal(TriggerValue::FALL, getTimeNowNt(), 0);
+	hwHandleVvtCamSignal(false, getTimeNowNt(), 0);
 	eth.moveTimeForwardUs(MS2US(10));
-	hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0);
+	hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
 
 	ASSERT_FLOAT_EQ(0, engine->triggerCentral.getVVTPosition(0, 0));
 	ASSERT_EQ(totalRevolutionCountBeforeVvtSync, engine->triggerCentral.triggerState.getCrankSynchronizationCounter());
@@ -178,9 +178,9 @@ TEST(trigger, testNB2CamInput) {
 	// Third gap - long
 
 	eth.moveTimeForwardUs(MS2US(130));
-	hwHandleVvtCamSignal(TriggerValue::FALL, getTimeNowNt(), 0);
+	hwHandleVvtCamSignal(false, getTimeNowNt(), 0);
 	eth.moveTimeForwardUs(MS2US( 30));
-	hwHandleVvtCamSignal(TriggerValue::RISE, getTimeNowNt(), 0);
+	hwHandleVvtCamSignal(true, getTimeNowNt(), 0);
 
 	EXPECT_NEAR(290.5f, engine->triggerCentral.getVVTPosition(0, 0), EPS2D);
 	// actually position based on VVT!