diff --git a/firmware/config/engines/bmw_m73.cpp b/firmware/config/engines/bmw_m73.cpp
index e2c8340c99..f67f0282cc 100644
--- a/firmware/config/engines/bmw_m73.cpp
+++ b/firmware/config/engines/bmw_m73.cpp
@@ -72,6 +72,8 @@
  * @author Andrey Belomutskiy, (c) 2012-2020
  */
 
+#include "pch.h"
+
 #include "bmw_m73.h"
 #include "custom_engine.h"
 #include "hip9011_logic.h"
diff --git a/firmware/controllers/algo/auto_generated_codes.cpp b/firmware/controllers/algo/auto_generated_codes.cpp
index 903e55c8ba..7f930fa02d 100644
--- a/firmware/controllers/algo/auto_generated_codes.cpp
+++ b/firmware/controllers/algo/auto_generated_codes.cpp
@@ -57,8 +57,6 @@ case CUSTOM_EGO_TYPE:
   return "CUSTOM_EGO_TYPE";
 case CUSTOM_EMPTY_FSIO_STACK:
   return "CUSTOM_EMPTY_FSIO_STACK";
-case CUSTOM_ENGINE_REF:
-  return "CUSTOM_ENGINE_REF";
 case CUSTOM_ERROR_ICU:
   return "CUSTOM_ERROR_ICU";
 case CUSTOM_ERR_2ND_WATCHDOG:
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index b98870c980..1dd2266d92 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -1164,8 +1164,6 @@ void applyNonPersistentConfiguration() {
 	efiPrintf("applyNonPersistentConfiguration()");
 #endif
 
-	assertEngineReference();
-
 #if EFI_ENGINE_CONTROL
 	engine->initializeTriggerWaveform();
 #endif // EFI_ENGINE_CONTROL
diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h
index e26786dd7f..163a5eee4b 100644
--- a/firmware/controllers/algo/obd_error_codes.h
+++ b/firmware/controllers/algo/obd_error_codes.h
@@ -1945,7 +1945,7 @@ typedef enum {
 	CUSTOM_ERR_6598 = 6598,
 	CUSTOM_ERR_6599 = 6599,
 
-	CUSTOM_ENGINE_REF = 6600,
+	CUSTOM_ERR_6600 = 6600,
 	CUSTOM_CONSOLE_TOO_MANY = 6601,
 	CUSTOM_APPEND_NULL = 6602,
 	CUSTOM_ERR_6603 = 6603,
diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp
index af8653d7be..be4f58b227 100644
--- a/firmware/controllers/core/fsio_impl.cpp
+++ b/firmware/controllers/core/fsio_impl.cpp
@@ -83,7 +83,6 @@ static LEElement * mainRelayLogic;
 #if EFI_PROD_CODE || EFI_SIMULATOR
 
 FsioResult getEngineValue(le_action_e action) {
-	efiAssert(CUSTOM_ERR_ASSERT, engine!=NULL, "getLEValue", unexpected);
 	switch (action) {
 	case LE_METHOD_FAN:
 		return enginePins.fanRelay.getLogicValue();
diff --git a/firmware/controllers/engine_cycle/fuel_schedule.cpp b/firmware/controllers/engine_cycle/fuel_schedule.cpp
index 8101a65202..5388f71f4f 100644
--- a/firmware/controllers/engine_cycle/fuel_schedule.cpp
+++ b/firmware/controllers/engine_cycle/fuel_schedule.cpp
@@ -30,8 +30,6 @@ void FuelSchedule::resetOverlapping() {
  * @returns false in case of error, true if success
  */
 bool FuelSchedule::addFuelEventsForCylinder(int i ) {
-	efiAssert(CUSTOM_ERR_ASSERT, engine!=NULL, "engine is NULL", false);
-
 	floatus_t oneDegreeUs = engine->rpmCalculator.oneDegreeUs; // local copy
 	if (cisnan(oneDegreeUs)) {
 		// in order to have fuel schedule we need to have current RPM
diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
index d65943d87f..197beb8c6e 100644
--- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp
+++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
@@ -503,8 +503,6 @@ static void showMainInfo(Engine *engine) {
 }
 
 void initMainEventListener() {
-	efiAssertVoid(CUSTOM_ERR_6631, engine!=NULL, "null engine");
-
 #if EFI_PROD_CODE
 	addConsoleActionP("maininfo", (VoidPtr) showMainInfo, engine);
 #endif
diff --git a/firmware/controllers/engine_cycle/rpm_calculator.h b/firmware/controllers/engine_cycle/rpm_calculator.h
index e9be187994..14847c26b9 100644
--- a/firmware/controllers/engine_cycle/rpm_calculator.h
+++ b/firmware/controllers/engine_cycle/rpm_calculator.h
@@ -180,7 +180,7 @@ void initRpmCalculator();
 #define getRevolutionCounter() (engine->rpmCalculator.getRevolutionCounterM())
 
 #if EFI_ENGINE_SNIFFER
-#define addEngineSnifferEvent(name, msg) { efiAssertVoid(OBD_PCM_Processor_Fault, engine!=NULL, "engine ptr missing");  if (engine->isEngineChartEnabled) { waveChart.addEvent3((name), (msg)); } }
+#define addEngineSnifferEvent(name, msg) { if (engine->isEngineChartEnabled) { waveChart.addEvent3((name), (msg)); } }
  #else
 #define addEngineSnifferEvent(n, msg) {}
 #endif /* EFI_ENGINE_SNIFFER */
diff --git a/firmware/controllers/flash_main.cpp b/firmware/controllers/flash_main.cpp
index 419bb7629c..997eecf054 100644
--- a/firmware/controllers/flash_main.cpp
+++ b/firmware/controllers/flash_main.cpp
@@ -193,7 +193,6 @@ void writeToFlashNow(void) {
 	} else {
 		efiPrintf("Flashing failed");
 	}
-	assertEngineReference();
 
 	resetMaxValues();
 
diff --git a/firmware/controllers/lua/lua_can_rx.cpp b/firmware/controllers/lua/lua_can_rx.cpp
index 979140d5ae..5f7677be4f 100644
--- a/firmware/controllers/lua/lua_can_rx.cpp
+++ b/firmware/controllers/lua/lua_can_rx.cpp
@@ -117,7 +117,7 @@ bool doOneLuaCanRx(LuaHandle& ls) {
 
 	// We're done, return this frame to the free list
 	msg = freeBuffers.post(frame, TIME_IMMEDIATE);
-	efiAssertVoid(OBD_PCM_Processor_Fault, msg == MSG_OK, "lua can post to free buffer fail");
+	efiAssert(OBD_PCM_Processor_Fault, msg == MSG_OK, "lua can post to free buffer fail", false);
 
 	// We processed a frame so we should check again
 	return true;
diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h
index c304e4747c..abe193b059 100644
--- a/firmware/controllers/math/engine_math.h
+++ b/firmware/controllers/math/engine_math.h
@@ -11,8 +11,6 @@
 
 void setAlgorithm(engine_load_mode_e algo);
 
-#define assertEngineReference() efiAssertVoid(CUSTOM_ENGINE_REF, engine != NULL, "engine is NULL")
-
 void setFlatInjectorLag(float value);
 
 #define fixAngle(angle, msg, code) fixAngle2(angle, msg, code, engine->engineCycle)
diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index c9e34ef396..7f4203a4b4 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -820,8 +820,6 @@ void onConfigurationChangeTriggerCallback() {
 	changed |= isConfigurationChanged(overrideTriggerGaps);
 
 	if (changed) {
-		assertEngineReference();
-
 	#if EFI_ENGINE_CONTROL
 		engine->initializeTriggerWaveform();
 		engine->triggerCentral.noiseFilter.resetAccumSignalData();
diff --git a/firmware/pch/pch.h b/firmware/pch/pch.h
index 54543a840c..1dd48a2b93 100644
--- a/firmware/pch/pch.h
+++ b/firmware/pch/pch.h
@@ -9,6 +9,14 @@
  * this file.
  */
 
+#ifndef FALSE
+#define FALSE (0)
+#endif /* FALSE */
+
+#ifndef TRUE
+#define TRUE (!(FALSE))
+#endif /* TRUE */
+
 #include "efifeatures.h"
 #include "rusefi_generated.h"
 #include "loggingcentral.h"
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index feb6ef1b14..48d1a0f366 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -164,7 +164,6 @@ void runMainLoop();
 
 void runRusEfi() {
 	efiAssertVoid(CUSTOM_RM_STACK_1, getCurrentRemainingStack() > 512, "init s");
-	assertEngineReference();
 	engine->setConfig();
 
 #if EFI_TEXT_LOGGING
diff --git a/firmware/util/containers/cyclic_buffer.h b/firmware/util/containers/cyclic_buffer.h
index 3b61d12a1e..1a6af0acbb 100644
--- a/firmware/util/containers/cyclic_buffer.h
+++ b/firmware/util/containers/cyclic_buffer.h
@@ -16,7 +16,6 @@
 #include <limits>
 #include <string.h>
 #include <stdint.h>
-#include "rusefi_true.h"
 
 static const short CB_MAX_SIZE = 128;
 
@@ -78,10 +77,10 @@ template<typename T, size_t maxSize>
 bool cyclic_buffer<T, maxSize>::contains(T value) const {
 	for (int i = 0; i < currentIndex ; i++) {
 		if (elements[i] == value) {
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 template<typename T, size_t maxSize>
diff --git a/firmware/util/rusefi_true.h b/firmware/util/rusefi_true.h
deleted file mode 100644
index 376bcc32a2..0000000000
--- a/firmware/util/rusefi_true.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * rusefi_true.h
- *
- * @date Dec 8, 2018
- * @author Andrey Belomutskiy, (c) 2012-2020
- */
-
-#pragma once
-
-// we still have a minor mess with headers, this header should better be included as high as possible
-
-#ifndef FALSE
-#define FALSE (0)
-#endif /* FALSE */
-
-#ifndef TRUE
-#define TRUE (!(FALSE))
-#endif /* TRUE */
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index d5e8e835d7..b1870097c9 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "rusefi_true.h"
-
 // see SIM_SD1_PORT and SIM_SD2_PORT
 #define TS_PRIMARY_SERIAL SD1
 #define TS_SECONDARY_SERIAL SD2
diff --git a/unit_tests/efifeatures.h b/unit_tests/efifeatures.h
index 8cad2dcf7d..d2c30fb3b5 100644
--- a/unit_tests/efifeatures.h
+++ b/unit_tests/efifeatures.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "rusefi_true.h"
-
 #define EFI_ENABLE_ASSERTS TRUE
 
 #define EFI_EMULATE_POSITION_SENSORS TRUE