diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index 3d916f0a68..f028185611 100644
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -22,7 +22,7 @@
 
 // Removed to make the firmware fit into flash (in descending order of priority):
 #undef USE_GYRO_OVERFLOW_CHECK // target does not use affected gyros
-#undef USE_RTC_TIME
+//#undef USE_RTC_TIME
 
 #define TARGET_BOARD_IDENTIFIER "CLBR"
 
diff --git a/src/main/target/CRAZYBEEF3FR/target.h b/src/main/target/CRAZYBEEF3FR/target.h
index b32207ef8b..dc63f20684 100644
--- a/src/main/target/CRAZYBEEF3FR/target.h
+++ b/src/main/target/CRAZYBEEF3FR/target.h
@@ -45,8 +45,8 @@
 #undef USE_PINIO
 #undef USE_PINIOBOX
 
-#undef USE_TELEMETRY_HOTT
-#undef USE_TELEMETRY_MAVLINK
+//#undef USE_TELEMETRY_HOTT
+//#undef USE_TELEMETRY_MAVLINK
 #undef USE_TELEMETRY_LTM
 #undef USE_SERIALRX_XBUS
 #undef USE_SERIALRX_SUMH
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index 7f07389c7a..6f7bf7aa7d 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -30,9 +30,9 @@
 //#undef USE_ITERM_RELAX
 //#undef USE_RC_SMOOTHING_FILTER
 
-#undef USE_HUFFMAN
-#undef USE_PINIO
-#undef USE_PINIOBOX
+//#undef USE_HUFFMAN
+//#undef USE_PINIO
+//#undef USE_PINIOBOX
 
 #undef USE_TELEMETRY_HOTT
 #undef USE_TELEMETRY_MAVLINK
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index 4fbc5a0ede..d3539d8b91 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -42,8 +42,8 @@
 //#undef USE_PINIO
 //#undef USE_PINIOBOX
 
-#undef USE_TELEMETRY_HOTT
-#undef USE_TELEMETRY_MAVLINK
+//#undef USE_TELEMETRY_HOTT
+//#undef USE_TELEMETRY_MAVLINK
 #undef USE_TELEMETRY_LTM
 #undef USE_SERIALRX_XBUS
 #undef USE_SERIALRX_SUMH
diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h
index e4bf0d25ed..8972875aa4 100644
--- a/src/main/target/IMPULSERCF3/target.h
+++ b/src/main/target/IMPULSERCF3/target.h
@@ -37,7 +37,7 @@
 
 //#undef USE_BOARD_INFO
 #undef USE_EXTENDED_CMS_MENUS
-#undef USE_RTC_TIME
+//#undef USE_RTC_TIME
 #undef USE_RX_MSP
 #undef USE_ESC_SENSOR_INFO
 
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index affc907e6b..51f9672862 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -27,9 +27,9 @@
 #endif
 
 // Removed to make the firmware fit into flash (in descending order of priority):
-#undef USE_RTC_TIME
+//#undef USE_RTC_TIME
 #undef USE_RX_MSP
-#undef USE_ESC_SENSOR_INFO
+//#undef USE_ESC_SENSOR_INFO
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index c73bbda271..6dc2a8b89d 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -26,7 +26,7 @@
 #undef USE_GYRO_OVERFLOW_CHECK
 #undef USE_GYRO_LPF2
 
-#undef USE_ITERM_RELAX
+//#undef USE_ITERM_RELAX
 #undef USE_RC_SMOOTHING_FILTER
 
 #undef USE_HUFFMAN
diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h
index f5b89df44d..fb86e1fb42 100644
--- a/src/main/target/RACEBASE/target.h
+++ b/src/main/target/RACEBASE/target.h
@@ -44,7 +44,7 @@
 
 //#undef USE_BOARD_INFO
 #undef USE_EXTENDED_CMS_MENUS
-#undef USE_RTC_TIME
+//#undef USE_RTC_TIME
 #undef USE_RX_MSP
 #undef USE_ESC_SENSOR_INFO
 
diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h
index f120de20aa..3ebc2a5a51 100644
--- a/src/main/target/RCEXPLORERF3/target.h
+++ b/src/main/target/RCEXPLORERF3/target.h
@@ -26,8 +26,8 @@
 #undef USE_GYRO_OVERFLOW_CHECK
 #undef USE_GYRO_LPF2
 
-#undef USE_TELEMETRY_MAVLINK
-#undef USE_TELEMETRY_LTM
+//#undef USE_TELEMETRY_MAVLINK
+//#undef USE_TELEMETRY_LTM
 #undef USE_SERIALRX_XBUS
 
 #undef USE_EXTENDED_CMS_MENUS
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index 7a355c7e74..82b00cc701 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -23,9 +23,9 @@
 #define TARGET_BOARD_IDENTIFIER "RGF3" // rgSSD_F3
 
 // Removed to make the firmware fit into flash (in descending order of priority):
-#undef USE_RTC_TIME
+//#undef USE_RTC_TIME
 #undef USE_RX_MSP
-#undef USE_ESC_SENSOR_INFO
+//#undef USE_ESC_SENSOR_INFO
 
 #define LED0_PIN                 PC1
 #define LED1_PIN                 PC0
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index 16db889f40..0a62dd82b9 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -33,8 +33,8 @@
 #undef USE_PINIO
 #undef USE_PINIOBOX
 
-#undef USE_TELEMETRY_HOTT
-#undef USE_TELEMETRY_MAVLINK
+//#undef USE_TELEMETRY_HOTT
+//#undef USE_TELEMETRY_MAVLINK
 #undef USE_TELEMETRY_LTM
 #undef USE_SERIALRX_XBUS
 #undef USE_SERIALRX_SUMH
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index bacd56ec96..949794bf49 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -36,6 +36,7 @@
 //#undef USE_GYRO_OVERFLOW_CHECK
 //#undef USE_GYRO_LPF2
 
+#if !(defined(ZCOREF3) || defined(FLIP32F3OSD) || defined(IRCSYNERGYF3))
 //#undef USE_ITERM_RELAX
 //#undef USE_RC_SMOOTHING_FILTER
 
@@ -54,9 +55,12 @@
 //#undef USE_SERIALRX_SUMH
 #undef USE_PWM
 
-#undef USE_BOARD_INFO
 #undef USE_EXTENDED_CMS_MENUS
+#endif
+
+#undef USE_BOARD_INFO
 #undef USE_RTC_TIME
+
 #undef USE_RX_MSP
 #undef USE_ESC_SENSOR_INFO
 
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index e7b54f9a9b..766dbcac7a 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -56,7 +56,7 @@
 
 #undef USE_BOARD_INFO
 //#undef USE_RX_MSP
-#undef USE_RTC_TIME
+//#undef USE_RTC_TIME
 #undef USE_EXTENDED_CMS_MENUS
 #undef USE_ESC_SENSOR_INFO