diff --git a/firmware/console/binary/signature.cpp b/firmware/console/binary/signature.cpp
index ebef3e4137..10c6d0fe0d 100644
--- a/firmware/console/binary/signature.cpp
+++ b/firmware/console/binary/signature.cpp
@@ -17,7 +17,7 @@
 #undef TS_SIGNATURE
 
 #ifndef SHORT_BOARD_NAME
-#define SHORT_BOARD_NAME all
+#error SHORT_BOARD_NAME must be defined!
 #endif /* SHORT_BOARD_NAME */
 
 #pragma message ("SHORT_BOARD_NAME: " QUOTE(SHORT_BOARD_NAME))
diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h
deleted file mode 100644
index 0cf5276104..0000000000
--- a/firmware/controllers/generated/signature_all.h
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer
-//
-
-#define SIGNATURE_HASH 2319868418
-#define TS_SIGNATURE "rusEFI master.2023.02.01.all.2319868418"
diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h
deleted file mode 100644
index 54f587df03..0000000000
--- a/firmware/controllers/generated/signature_cypress.h
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer
-//
-
-#define SIGNATURE_HASH 2673328549
-#define TS_SIGNATURE "rusEFI master.2023.02.21.cypress.2673328549"
diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h
deleted file mode 100644
index 214cce14ce..0000000000
--- a/firmware/controllers/generated/signature_kin.h
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer
-//
-
-#define SIGNATURE_HASH 4152386409
-#define TS_SIGNATURE "rusEFI master.2023.02.21.kin.4152386409"
diff --git a/simulator/Makefile b/simulator/Makefile
index db94020164..a2f17162af 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -253,7 +253,7 @@ CPPWARN = -Wall -Wextra -Wundef
 
 # List all user C define here, like -D_DEBUG=1
 UDEFS = -DSIMULATOR
-DDEFS += -DFIRMWARE_ID=\"simulator\"
+DDEFS += -DFIRMWARE_ID=\"simulator\" -DSHORT_BOARD_NAME=f407-discovery
 
 
 # Define ASM defines here