diff --git a/firmware/compile_and_program.bat b/firmware/compile_and_program.bat
deleted file mode 100644
index aa4f61a978..0000000000
--- a/firmware/compile_and_program.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-@echo off
-
-call compile.bat
-
-rem svn info > ../firmware_binary/version.txt
-rem cp config/features.h ../firmware_binary
-rem cp build/rusefi.hex ../firmware_binary
-rem cp build/rusefi.elf ../firmware_binary
-
-rem cp tunerstudio/rusefi.ini ../firmware_binary
-
-rem cd ../firmware_binary
-rem del firmaware_binary.zip
-rem 7z a firmaware_binary.zip rusefi.hex rusefi.ini features.h flash.bat
-rem cd ../firmware
-
-
-echo Looking at size
-arm-none-eabi-size  --format=berkeley "build\rusefi.elf"
-echo Compiler gcc version
-arm-none-eabi-gcc -v
-
-echo Have the file, let's program the board right away
-call flash_openocd
-
-echo Done flashing                       
diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat
index 7c4f305171..bf820b2ec8 100644
--- a/firmware/gen_config.bat
+++ b/firmware/gen_config.bat
@@ -4,5 +4,5 @@ bash.exe gen_config.sh
 rem This would automatically copy latest file to 'dev' TS project
 set ts_path="%HOMEDRIVE%%HOMEPATH%\Documents\TunerStudioProjects"
 echo %ts_path%
-cp tunerstudio/generated/rusefi.ini %ts_path%\dev\projectCfg\mainController.ini
+cp tunerstudio/generated/rusefi_f407-discovery.ini %ts_path%\dev\projectCfg\mainController.ini
 cp tunerstudio/generated/rusefi_mre_f4.ini %ts_path%\mre_f4\projectCfg\mainController.ini
diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh
index b6f9e9aabb..9bda2da3b2 100755
--- a/firmware/gen_config.sh
+++ b/firmware/gen_config.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "This script reads rusefi_config.txt and produces firmware persistent configuration headers"
-echo "The storage section of rusefi.ini is updated as well"
+echo "The storage section of rusefi_xxx.ini is updated as well"
 
 rm -f gen_config.log
 rm -f gen_config_board.log
diff --git a/firmware/gen_config_default.sh b/firmware/gen_config_default.sh
index 5218e2c037..0a647963e8 100755
--- a/firmware/gen_config_default.sh
+++ b/firmware/gen_config_default.sh
@@ -6,6 +6,7 @@ cd ../java_tools
 cd ../firmware
 
 bash gen_signature.sh f407-discovery
+# todo: eliminate that legacy `rusefi.ini'!
 bash gen_config_board.sh config/boards/f407-discovery f407-discovery rusefi.ini
 bash bin/gen_image_board.sh config/boards/f407-discovery f407-discovery rusefi.ini
 exit $?
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index f314efb64f..0c1a27d44c 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -105,7 +105,7 @@ struct_no_prefix persistent_config_s
 
 struct_no_prefix engine_configuration_s
 
-! see 'blockingFactor' in rusefi.ini
+! see 'blockingFactor' in tunerstudio.template.ini
 ! please keep it bigger than (TS_TOTAL_OUTPUT_SIZE / 2) so whole livedata can be
 ! transfered using two chunks, this will give us 500 Hz refresh rate.
 #define BLOCKING_FACTOR 1024