diff --git a/src/main/target/CRAZYBEEF3FR/target.h b/src/main/target/CRAZYBEEF3FR/target.h
index b9737f3c3..7c59e745f 100644
--- a/src/main/target/CRAZYBEEF3FR/target.h
+++ b/src/main/target/CRAZYBEEF3FR/target.h
@@ -42,11 +42,11 @@
 //#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
+#undef USE_SERIALRX_XBUS
+#undef USE_SERIALRX_SUMH
 #undef USE_PWM
 
 //#undef USE_BOARD_INFO
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index 36071d458..3e2fbdeba 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -42,14 +42,12 @@
 //#undef USE_PINIO
 //#undef USE_PINIOBOX
 
-#ifdef FURYF3OSD
 #undef USE_TELEMETRY_HOTT
 #undef USE_TELEMETRY_MAVLINK
 #undef USE_TELEMETRY_LTM
 #undef USE_SERIALRX_XBUS
-//#undef USE_SERIALRX_SUMH
-//#undef USE_PWM
-#endif
+#undef USE_SERIALRX_SUMH
+#undef USE_PWM
 
 #undef USE_BOARD_INFO
 #undef USE_EXTENDED_CMS_MENUS
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index 38d649c1c..dd5d32361 100644
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -30,11 +30,20 @@
 
 #undef USE_ITERM_RELAX
 #undef USE_RC_SMOOTHING_FILTER
-  
+
+//#undef USE_MSP_DISPLAYPORT
+//#undef USE_MSP_OVER_TELEMETRY
+
+#undef USE_HUFFMAN
+#undef USE_PINIO
+#undef USE_PINIOBOX
+
 #undef USE_TELEMETRY_HOTT
 #undef USE_TELEMETRY_MAVLINK
 #undef USE_TELEMETRY_LTM
 #undef USE_SERIALRX_XBUS
+#undef USE_SERIALRX_SUMH
+#undef USE_PWM
 
 #undef USE_BOARD_INFO
 #undef USE_EXTENDED_CMS_MENUS
@@ -42,7 +51,6 @@
 #undef USE_RX_MSP
 #undef USE_ESC_SENSOR_INFO
 
-
 #define LED0_PIN                PB9
 #define LED1_PIN                PB2