diff --git a/firmware/compile_and_program.bat b/firmware/compile_and_program.bat
index 1d954020f5..c8481be98a 100644
--- a/firmware/compile_and_program.bat
+++ b/firmware/compile_and_program.bat
@@ -13,8 +13,8 @@ rem magic once needed
 call update_version.bat
 
 echo Starting compilation
-rem the important piece
-make
+rem the important piece (pass external args if needed)
+make %1 %2 %3
 
 rem cd build
 rem if not exist rusefi.hex echo "compilation failed"
diff --git a/firmware/config/boards/ST_STM32F4/board.mk b/firmware/config/boards/ST_STM32F4/board.mk
index 25db37f4ac..e3be9cd995 100644
--- a/firmware/config/boards/ST_STM32F4/board.mk
+++ b/firmware/config/boards/ST_STM32F4/board.mk
@@ -3,3 +3,6 @@ BOARDSRC = $(PROJECT_DIR)/config/boards/ST_STM32F4/board.c
 
 # Required include directories
 BOARDINC = $(PROJECT_DIR)/config/boards/ST_STM32F4
+
+# MCU defines
+DDEFS += -DSTM32F407xx -DSTM32F40_41xxx
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 9db0fb827a..a584a1b51a 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -263,10 +263,6 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
 	engineConfiguration->cj125ua = EFI_ADC_NONE;
 	engineConfiguration->cj125ur = EFI_ADC_NONE;
 
-	boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED;
-	boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED;
-	engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;
-
 	boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED;
 	boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED;
 	engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;
diff --git a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c
index cbf1661834..a58a7d7353 100644
--- a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c
+++ b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c
@@ -93,8 +93,6 @@
   */ 
 
 /* Includes ------------------------------------------------------------------*/
-#define STM32F407xx
-#define STM32F40_41xxx
 #define assert_param(expr) ((void)0)
 
 //#include "stm32f4xx_hal.h"
diff --git a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
index 5857b76f68..f95e561152 100644
--- a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
+++ b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
@@ -80,8 +80,6 @@
 
 /* Includes ------------------------------------------------------------------*/
 
-#define STM32F407xx
-#define STM32F40_41xxx
 #define assert_param(expr) ((void)0)
 
 #define HAL_FLASH_MODULE_ENABLED