diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index a75911d1b8..c282efcbcc 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -374,7 +374,7 @@ void handleBurnCommand(TsChannelBase* tsChannel, ts_response_format_e mode) {
 	efiPrintf("BURN in %dms", currentTimeMillis() - nowMs);
 }
 
-#if EFI_TUNER_STUDIO
+#if EFI_TUNER_STUDIO && (EFI_PROD_CODE || EFI_SIMULATOR)
 
 static bool isKnownCommand(char command) {
 	return command == TS_HELLO_COMMAND || command == TS_READ_COMMAND || command == TS_OUTPUT_COMMAND
@@ -544,6 +544,7 @@ void handleQueryCommand(TsChannelBase* tsChannel, ts_response_format_e mode) {
  * rusEfi own test command
  */
 static void handleTestCommand(TsChannelBase* tsChannel) {
+#if EFI_PROD_CODE || EFI_SIMULATOR
 	tsState.testCommandCounter++;
 	char testOutputBuffer[64];
 	/**
@@ -568,14 +569,17 @@ static void handleTestCommand(TsChannelBase* tsChannel) {
 		tsChannel->write((const uint8_t*)testOutputBuffer, strlen(testOutputBuffer));
 	}
 	tsChannel->flush();
+#endif
 }
 
 extern CommandHandler console_line_callback;
 
 static void handleGetVersion(TsChannelBase* tsChannel) {
+#if EFI_PROD_CODE || EFI_SIMULATOR
 	char versionBuffer[32];
 	chsnprintf(versionBuffer, sizeof(versionBuffer), "rusEFI v%d@%s", getRusEfiVersion(), VCS_VERSION);
 	tsChannel->sendResponse(TS_CRC, (const uint8_t *) versionBuffer, strlen(versionBuffer) + 1);
+#endif
 }
 
 #if EFI_TEXT_LOGGING
diff --git a/firmware/console/binary/tunerstudio.h b/firmware/console/binary/tunerstudio.h
index 38ffb7c57f..9cd4b75314 100644
--- a/firmware/console/binary/tunerstudio.h
+++ b/firmware/console/binary/tunerstudio.h
@@ -35,9 +35,6 @@ uint8_t* getWorkingPageAddr();
 #include "thread_controller.h"
 #include "thread_priority.h"
 
-
-#define CONNECTIVITY_THREAD_STACK (2 * UTILITY_THREAD_STACK_SIZE)
-
 /**
  * handle non CRC wrapped command
  */
@@ -70,6 +67,9 @@ post_packed {
 	short int count;
 } TunerStudioWriteChunkRequest;
 
+#if EFI_PROD_CODE || EFI_SIMULATOR
+#define CONNECTIVITY_THREAD_STACK (2 * UTILITY_THREAD_STACK_SIZE)
+
 class TunerstudioThread : public ThreadController<CONNECTIVITY_THREAD_STACK> {
 public:
 	TunerstudioThread(const char* name)
@@ -81,7 +81,9 @@ public:
 	virtual TsChannelBase* setupChannel() = 0;
 
 	void ThreadTask() override;
+
 };
+#endif
 
 #endif /* EFI_TUNER_STUDIO */
 
diff --git a/firmware/controllers/algo/airmass/speed_density_airmass.cpp b/firmware/controllers/algo/airmass/speed_density_airmass.cpp
index b17b59f150..28dce5d7d1 100644
--- a/firmware/controllers/algo/airmass/speed_density_airmass.cpp
+++ b/firmware/controllers/algo/airmass/speed_density_airmass.cpp
@@ -23,8 +23,7 @@ AirmassResult SpeedDensityAirmass::getAirmass(int rpm) {
 		return {};
 	}
 #if EFI_PRINTF_FUEL_DETAILS
-	printf("getSpeedDensityAirmass map=%.2f\n",
-			map);
+	printf("getSpeedDensityAirmass map=%.2f\n", map);
 #endif /*EFI_PRINTF_FUEL_DETAILS */
 
 	return {