diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index a4bf5da8a..7869a48eb 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -448,7 +448,7 @@ static bool testBlackboxConditionUncached(FlightLogFieldCondition condition)
 #endif
 
     case FLIGHT_LOG_FIELD_CONDITION_RSSI:
-        return rxConfig()->rssi_channel > 0 || featureIsEnabled(FEATURE_RSSI_ADC);
+        return isRssiConfigured();
 
     case FLIGHT_LOG_FIELD_CONDITION_NOT_LOGGING_EVERY_FRAME:
         return blackboxConfig()->p_ratio != 1;
diff --git a/src/main/drivers/usb_io.c b/src/main/drivers/usb_io.c
index 85944babe..f08f83530 100644
--- a/src/main/drivers/usb_io.c
+++ b/src/main/drivers/usb_io.c
@@ -30,9 +30,8 @@
 #include "usb_io.h"
 #include "sdcard.h"
 
-
 #ifdef USE_USB_DETECT
-static IO_t usbDetectPin = IO_NONE;
+static IO_t usbDetectPin;
 #endif
 
 void usbCableDetectDeinit(void)
@@ -47,9 +46,6 @@ void usbCableDetectDeinit(void)
 void usbCableDetectInit(void)
 {
 #ifdef USE_USB_DETECT
-#ifndef USB_DETECT_PIN
-#define USB_DETECT_PIN NONE
-#endif
     usbDetectPin = IOGetByTag(IO_TAG(USB_DETECT_PIN));
 
     IOInit(usbDetectPin, OWNER_USB_DETECT, 0);
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index 630720c5c..b75c9bdbe 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -3840,6 +3840,9 @@ const cliResourceValue_t resourceTable[] = {
     DEFS( OWNER_RX_SPI_CS,     PG_RX_SPI_CONFIG, rxSpiConfig_t, csnTag ),
 #endif
     DEFW( OWNER_GYRO_CS,       PG_GYRO_DEVICE_CONFIG, gyroDeviceConfig_t, csnTag, 2 ),
+#ifdef USE_USB_DETECT
+    DEFS( OWNER_USB_DETECT,    PG_USB_CONFIG, usbDev_t, detectPin ),
+#endif
 };
 
 #undef DEFS
diff --git a/src/main/pg/usb.c b/src/main/pg/usb.c
index 3eddf59e7..c13853a7a 100644
--- a/src/main/pg/usb.c
+++ b/src/main/pg/usb.c
@@ -20,28 +20,20 @@
 
 #include "platform.h"
 
-#if defined(USE_USB_ADVANCED_PROFILES)
+#ifdef USE_VCP
+
 #include "drivers/io.h"
 
 #include "pg/pg_ids.h"
 
 #include "usb.h"
 
-#if !defined(USB_MSC_BUTTON_PIN)
-#define USB_MSC_BUTTON_PIN NONE
-#endif
-
-#if defined(USE_USB_MSC_BUTTON_IPU)
-#define MSC_BUTTON_IPU true
-#else
-#define MSC_BUTTON_IPU false
-#endif
-
 PG_REGISTER_WITH_RESET_TEMPLATE(usbDev_t, usbDevConfig, PG_USB_CONFIG, 0);
 
 PG_RESET_TEMPLATE(usbDev_t, usbDevConfig,
     .type = DEFAULT,
     .mscButtonPin = IO_TAG(USB_MSC_BUTTON_PIN),
     .mscButtonUsePullup = MSC_BUTTON_IPU,
+    .detectPin = IO_TAG(USB_DETECT_PIN),
 );
 #endif
diff --git a/src/main/pg/usb.h b/src/main/pg/usb.h
index 538881dc1..8acffd24b 100644
--- a/src/main/pg/usb.h
+++ b/src/main/pg/usb.h
@@ -33,6 +33,7 @@ typedef struct usbDev_s {
     uint8_t type;
     ioTag_t mscButtonPin;
     uint8_t mscButtonUsePullup;
+    ioTag_t detectPin;
 } usbDev_t;
 
 PG_DECLARE(usbDev_t, usbDevConfig);
diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c
index 1319ce8cc..d4c8e29ea 100644
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@@ -697,3 +697,8 @@ uint16_t rxGetRefreshRate(void)
 {
     return rxRuntimeConfig.rxRefreshRate;
 }
+
+bool isRssiConfigured(void)
+{
+    return rssiSource != RSSI_SOURCE_NONE;
+}
diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h
index a6d1c378d..92b4a6108 100644
--- a/src/main/rx/rx.h
+++ b/src/main/rx/rx.h
@@ -166,6 +166,7 @@ void setRssiMsp(uint8_t newMspRssi);
 void updateRSSI(timeUs_t currentTimeUs);
 uint16_t getRssi(void);
 uint8_t getRssiPercent(void);
+bool isRssiConfigured(void);
 
 void resetAllRxChannelRangeConfigurations(rxChannelRangeConfig_t *rxChannelRangeConfig);
 
diff --git a/src/main/target/AIKONF4/target.h b/src/main/target/AIKONF4/target.h
index ef82acd6d..99df8ad06 100644
--- a/src/main/target/AIKONF4/target.h
+++ b/src/main/target/AIKONF4/target.h
@@ -71,7 +71,6 @@
 
 #define USE_UART1
 #define UART1_RX_PIN            PA10
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
 #define UART2_RX_PIN            PA3
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index a20055fa1..0f62cecfc 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -156,7 +156,7 @@
 #define USE_ADC
 #define VBAT_ADC_PIN                PC0
 #define CURRENT_METER_ADC_PIN       PC1
-#define RSSI_ADC_GPIO_PIN           PC2
+#define RSSI_ADC_PIN                PC2
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index d5899bf50..262a77573 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -83,7 +83,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 //SerialRX
 #define USE_UART2
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index 89e4acec8..533cd1599 100644
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -80,7 +80,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
 #define UART2_RX_PIN            PA3
diff --git a/src/main/target/BLUEJAYF4/initialisation.c b/src/main/target/BLUEJAYF4/initialisation.c
index 7f3b3b3f0..ff17d4730 100644
--- a/src/main/target/BLUEJAYF4/initialisation.c
+++ b/src/main/target/BLUEJAYF4/initialisation.c
@@ -37,6 +37,8 @@
 
 #include "hardware_revision.h"
 
+#define UART1_INVERTER          PC9
+
 void targetPreInit(void)
 {
     switch (hardwareRevision) {
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index dc84eacce..43f6a3808 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -41,9 +41,7 @@
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6      PB15
-//#define INVERTER_PIN_UART1     PC9
-
-#define UART1_INVERTER          PC9
+//#define INVERTER_PIN_UART1     PC9 // Polarity depends on revision; handled in config.c
 
 // MPU6500 interrupt
 #define USE_EXTI
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index 8ba04ea5e..457c9d8c0 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -64,7 +64,6 @@
 #define USE_GYRO_MPU6050
 
 //#define L3GD20_SPI                      SPI1
-//#define L3GD20_CS_GPIO_CLK_PERIPHERAL   RCC_AHBPeriph_GPIOE
 //#define L3GD20_CS_GPIO                  GPIOE
 //#define L3GD20_CS_PIN                   PE3
 
diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index 55897d35c..f2148c885 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -93,7 +93,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index e9b8e266e..865cd1a4f 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -80,7 +80,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PB7
 #define UART1_TX_PIN            PB6
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
 #define UART2_RX_PIN            PA3
diff --git a/src/main/target/ELLE0/target.h b/src/main/target/ELLE0/target.h
index d1066a868..df079d24e 100644
--- a/src/main/target/ELLE0/target.h
+++ b/src/main/target/ELLE0/target.h
@@ -62,7 +62,6 @@
 //#define USE_UART1
 //#define UART1_RX_PIN            PA10
 //#define UART1_TX_PIN            PA9
-//#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 /* RX1 */
 #define USE_UART2
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index 1ea9f2567..b39d10fc5 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -82,7 +82,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PB7
 #define UART1_TX_PIN            PB6
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
 #define UART2_RX_PIN            PD6
diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h
index 2ecd4d178..69ad9a9fa 100644
--- a/src/main/target/FRSKYF4/target.h
+++ b/src/main/target/FRSKYF4/target.h
@@ -80,7 +80,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index 7a8b215e0..81dd0ef26 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -110,7 +110,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-//#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11
diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h
index d159a560a..7d10adbd5 100644
--- a/src/main/target/ISHAPEDF3/target.h
+++ b/src/main/target/ISHAPEDF3/target.h
@@ -98,14 +98,6 @@
 #define CURRENT_METER_ADC_PIN       PA5
 #define RSSI_ADC_PIN                PB2
 
-#define WS2811_PIN                      PA8
-#define WS2811_TIMER                    TIM1
-#define WS2811_DMA_CHANNEL              DMA1_Channel2
-#define WS2811_IRQ                      DMA1_Channel2_IRQn
-#define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2
-#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH2_HANDLER
-#define WS2811_TIMER_GPIO_AF            GPIO_AF_6
-
 #define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 3bdc3c9b2..556c78c37 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -133,8 +133,6 @@
 #define UART1_TX_PIN            PA9
 #endif
 
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
-
 #define USE_UART3
 #define UART3_RX_PIN            PB11
 #define UART3_TX_PIN            PB10
diff --git a/src/main/target/KAKUTEF7/config.c b/src/main/target/KAKUTEF7/config.c
new file mode 100644
index 000000000..7c00897e0
--- /dev/null
+++ b/src/main/target/KAKUTEF7/config.c
@@ -0,0 +1,42 @@
+/*
+ * This file is part of Cleanflight and Betaflight.
+ *
+ * Cleanflight and Betaflight are free software. You can redistribute
+ * this software and/or modify this software under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * Cleanflight and Betaflight are distributed in the hope that they
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "platform.h"
+
+#ifdef USE_TARGET_CONFIG
+
+#include "config_helper.h"
+
+#include "io/serial.h"
+
+#define ESC_SENSOR_UART         SERIAL_PORT_USART7
+
+static targetSerialPortFunction_t targetSerialPortFunction[] = {
+    { ESC_SENSOR_UART, FUNCTION_ESC_SENSOR },
+};
+
+void targetConfiguration(void)
+{
+    targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
+}
+#endif
diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h
index 92afef84f..5b22fe375 100644
--- a/src/main/target/KAKUTEF7/target.h
+++ b/src/main/target/KAKUTEF7/target.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-//#define USE_TARGET_CONFIG
+#define USE_TARGET_CONFIG
 
 #ifdef KAKUTEF7V2
 #define TARGET_BOARD_IDENTIFIER "KT76"
@@ -168,7 +168,6 @@
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define SERIALRX_UART           SERIAL_PORT_USART6
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
-#define ESC_SENSOR_UART         SERIAL_PORT_USART7
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index 511d24359..99b152e2b 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -113,7 +113,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-//#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11
diff --git a/src/main/target/MATEKF411RX/target.h b/src/main/target/MATEKF411RX/target.h
index bcbfdcd55..ac541410d 100644
--- a/src/main/target/MATEKF411RX/target.h
+++ b/src/main/target/MATEKF411RX/target.h
@@ -71,7 +71,6 @@
 
 #define USE_RX_SPI
 #define RX_SPI_INSTANCE         SPI3
-#define RX_NSS_GPIO_CLK_PERIPHERAL   RCC_APB2Periph_GPIOA
 
 #define RX_SCK_PIN              SPI3_SCK_PIN
 #define RX_MISO_PIN             SPI3_MISO_PIN
diff --git a/src/main/target/MIDELICF3/target.h b/src/main/target/MIDELICF3/target.h
index 4f649694b..61f84756e 100644
--- a/src/main/target/MIDELICF3/target.h
+++ b/src/main/target/MIDELICF3/target.h
@@ -108,8 +108,6 @@
 
 #define USE_RX_SPI
 #define RX_SPI_INSTANCE         SPI1
-#define RX_NSS_GPIO_CLK_PERIPHERAL   RCC_APB2Periph_GPIOA
-
 
 #define USE_RX_FRSKY_SPI_D
 #define USE_RX_FRSKY_SPI_X
@@ -142,7 +140,7 @@
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0
+#define ESCSERIAL_TIMER_TX_PIN   PB9 // Motor 6, can't use escserial for hexa
 
 #define DEFAULT_FEATURES        (FEATURE_AIRMODE | FEATURE_TELEMETRY)
 
diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h
index 5a9b391fe..c06df225a 100644
--- a/src/main/target/MOTOLABF4/target.h
+++ b/src/main/target/MOTOLABF4/target.h
@@ -76,7 +76,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
 #define UART2_RX_PIN            PA3
@@ -139,7 +138,7 @@
 #define VBAT_ADC_PIN            PC0
 #define CURRENT_METER_ADC_PIN   PC1
 // Reserved pins, not connected
-//#define RSSI_ADC_GPIO_PIN       PC2
+//#define RSSI_ADC_PIN            PC2
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index f3885d364..a962d40b0 100644
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -84,7 +84,7 @@
 #define SERIAL_PORT_COUNT       5 //VCP, USART1, USART2, SOFTSERIAL1, SOFTSERIAL2
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PPM
+#define ESCSERIAL_TIMER_TX_PIN  PB10
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1
diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h
index 14797f58b..c310f5748 100644
--- a/src/main/target/NUCLEOF7/target.h
+++ b/src/main/target/NUCLEOF7/target.h
@@ -146,7 +146,7 @@
 #define USE_ADC
 #define VBAT_ADC_PIN                PA3
 #define CURRENT_METER_ADC_PIN       PC0
-#define RSSI_ADC_GPIO_PIN           PC3
+#define RSSI_ADC_PIN                PC3
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
diff --git a/src/main/target/NUCLEOF722/target.h b/src/main/target/NUCLEOF722/target.h
index 7692c58d5..4391bfeae 100644
--- a/src/main/target/NUCLEOF722/target.h
+++ b/src/main/target/NUCLEOF722/target.h
@@ -153,7 +153,7 @@
 #define USE_ADC
 #define VBAT_ADC_PIN                PA3
 #define CURRENT_METER_ADC_PIN       PC0
-#define RSSI_ADC_GPIO_PIN           PC3
+#define RSSI_ADC_PIN                PC3
 
 //#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
diff --git a/src/main/target/OMNIBUSF7/config.c b/src/main/target/OMNIBUSF7/config.c
index 2c0d96708..aabeb9cae 100644
--- a/src/main/target/OMNIBUSF7/config.c
+++ b/src/main/target/OMNIBUSF7/config.c
@@ -29,9 +29,14 @@
 
 #include "io/serial.h"
 
+#ifdef FPVM_BETAFLIGHTF7
+#define ESC_SENSOR_UART         SERIAL_PORT_USART1
+#elif defined(OMNIBUSF7V2)
+#define ESC_SENSOR_UART         SERIAL_PORT_USART7
+#endif
+
 static targetSerialPortFunction_t targetSerialPortFunction[] = {
-#if defined(OMNIBUSF7V2) && defined(ESC_SENSOR_UART)
-    // OMNIBUS F7 V2 has an option to connect UART7_RX to ESC telemetry
+#ifdef ESC_SENSOR_UART
     { ESC_SENSOR_UART, FUNCTION_ESC_SENSOR },
 #else
     { SERIAL_PORT_NONE, FUNCTION_NONE },
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index 293072924..d9349fcd3 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -237,12 +237,10 @@
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 #define SERIALRX_UART           SERIAL_PORT_USART6
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
-#define ESC_SENSOR_UART         SERIAL_PORT_USART1
 #else
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 #define SERIALRX_UART           SERIAL_PORT_USART2
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
-#define ESC_SENSOR_UART         SERIAL_PORT_USART7
 #endif
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
diff --git a/src/main/target/PYRODRONEF4/target.h b/src/main/target/PYRODRONEF4/target.h
index f73e17219..36fe061f3 100644
--- a/src/main/target/PYRODRONEF4/target.h
+++ b/src/main/target/PYRODRONEF4/target.h
@@ -69,7 +69,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
 #define UART2_RX_PIN            PA3
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 5468e6cdf..a4004c286 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -194,7 +194,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11
diff --git a/src/main/target/REVOLT/target.h b/src/main/target/REVOLT/target.h
index e3f9c31f1..dcf8dee68 100644
--- a/src/main/target/REVOLT/target.h
+++ b/src/main/target/REVOLT/target.h
@@ -128,7 +128,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index f7f8333cb..bcaf838f8 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -115,12 +115,10 @@
 #define I2C2_SCL_GPIO_AF         GPIO_AF_4
 #define I2C2_SCL_PIN             GPIO_Pin_9
 #define I2C2_SCL_PIN_SOURCE      GPIO_PinSource9
-#define I2C2_SCL_CLK_SOURCE      RCC_AHBPeriph_GPIOA
 #define I2C2_SDA_GPIO            GPIOA
 #define I2C2_SDA_GPIO_AF         GPIO_AF_4
 #define I2C2_SDA_PIN             GPIO_Pin_10
 #define I2C2_SDA_PIN_SOURCE      GPIO_PinSource10
-#define I2C2_SDA_CLK_SOURCE      RCC_AHBPeriph_GPIOA
 
 #define USE_ADC
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
diff --git a/src/main/target/SITL/target.h b/src/main/target/SITL/target.h
index 035b71dbb..da1daa596 100644
--- a/src/main/target/SITL/target.h
+++ b/src/main/target/SITL/target.h
@@ -138,10 +138,6 @@
 
 #define DEFIO_NO_PORTS   // suppress 'no pins defined' warning
 
-#define WS2811_DMA_TC_FLAG (void *)1
-#define WS2811_DMA_HANDLER_IDENTIFER 0
-
-
 // belows are internal stuff
 
 extern uint32_t SystemCoreClock;
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index 8c978bef3..a88e6ec9d 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -83,7 +83,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PA10
 #define UART1_TX_PIN            PA9
-#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART3
 #define UART3_RX_PIN            PB11
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index 68379e44e..48307da3d 100644
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -169,15 +169,6 @@
 #define CURRENT_METER_ADC_PIN   PC2
 #define RSSI_ADC_PIN            PC0
 
-#define USE_LED_STRIP_ON_DMA1_CHANNEL2
-#define WS2811_PIN                      PA8
-#define WS2811_TIMER                    TIM1
-#define WS2811_DMA_CHANNEL              DMA1_Channel2
-#define WS2811_IRQ                      DMA1_Channel2_IRQn
-#define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2
-#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH2_HANDLER
-#define WS2811_TIMER_GPIO_AF            GPIO_AF_6
-
 #define USE_TRANSPONDER
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
diff --git a/src/main/target/STM32F4DISCOVERY/target.h b/src/main/target/STM32F4DISCOVERY/target.h
index f2072b24b..b4ff75072 100644
--- a/src/main/target/STM32F4DISCOVERY/target.h
+++ b/src/main/target/STM32F4DISCOVERY/target.h
@@ -82,7 +82,7 @@
 #define SERIAL_PORT_COUNT       6 //VCP, USART1, USART3, USART4, USART6
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PB9
 
 //SPI
 #define USE_SPI
@@ -108,7 +108,6 @@
 #define USE_ADC
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define BOARD_HAS_VOLTAGE_DIVIDER
 #define VBAT_ADC_PIN            PC1
 #define CURRENT_METER_ADC_PIN   PC2
 
diff --git a/src/main/target/TINYFISH/target.h b/src/main/target/TINYFISH/target.h
index 4ac486e69..c4120752e 100644
--- a/src/main/target/TINYFISH/target.h
+++ b/src/main/target/TINYFISH/target.h
@@ -115,13 +115,6 @@
 #define CURRENT_METER_SCALE_DEFAULT    (0.005 * 0.001 * 30000) * 1000 * 10 * (CURRENT_TARGET_CPU_VOLTAGE / 3.3)
 #define CURRENT_METER_OFFSET_DEFAULT   0
 
-#define WS2811_PIN                      PA8
-#define WS2811_TIMER                    TIM1
-#define WS2811_DMA_CHANNEL              DMA1_Channel2
-#define WS2811_IRQ                      DMA1_Channel2_IRQn
-#define WS2811_DMA_TC_FLAG              DMA1_FLAG_TC2
-#define WS2811_DMA_HANDLER_IDENTIFER    DMA1_CH2_HANDLER
-
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define DEFAULT_FEATURES        ( FEATURE_TELEMETRY )
 #define USE_TARGET_CONFIG
diff --git a/src/main/target/UAVPNG030MINI/target.h b/src/main/target/UAVPNG030MINI/target.h
index 9b0defe05..1aba18511 100644
--- a/src/main/target/UAVPNG030MINI/target.h
+++ b/src/main/target/UAVPNG030MINI/target.h
@@ -38,12 +38,13 @@
 #define GYRO_1_SPI_INSTANCE    SPI1
 
 // TODO
-#define GYRO_MPU6000_ALIGN       CW180_DEG
-#define ACC_MPU6000_ALIGN        CW180_DEG
+#define GYRO_1_ALIGN           CW180_DEG
+#define ACC_1_ALIGN            CW180_DEG
 
 // MPU6000 interrupts
 #define USE_EXTI
-#define MPU_INT_EXTI             PE0
+#define USE_GYRO_EXTI
+#define GYRO_1_EXTI_PIN          PE0
 #define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_MAG
@@ -82,7 +83,6 @@
 #define USE_UART1
 #define UART1_RX_PIN            PB7
 #define UART1_TX_PIN            PB6
-//#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
 #define UART2_RX_PIN            PD6
@@ -100,7 +100,7 @@
 
 // TODO
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PA2
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1
diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h
index c29721e22..3311d7650 100644
--- a/src/main/target/WORMFC/target.h
+++ b/src/main/target/WORMFC/target.h
@@ -89,7 +89,7 @@
 #define SERIAL_PORT_COUNT       5 //VCP, USART1, USART3, USART4, USART6
 
 #define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+#define ESCSERIAL_TIMER_TX_PIN  PB9
 
 //SPI
 #define USE_SPI
@@ -111,7 +111,6 @@
 #define USE_ADC
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define BOARD_HAS_VOLTAGE_DIVIDER
 #define VBAT_ADC_PIN            PC1
 //#define RSSI_ADC_PIN            PC2
 #define CURRENT_METER_ADC_PIN   PC2
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 6ca501481..5e4330afe 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -124,7 +124,7 @@
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
 #define USE_ADC
-#define RSSI_ADC_GPIO_PIN       PC0
+#define RSSI_ADC_PIN            PC0
 #define VBAT_ADC_PIN            PC1
 #define CURRENT_METER_ADC_PIN   PC2
 #define CURRENT_METER_SCALE_DEFAULT 150
diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h
index edd954038..62fec2b4d 100644
--- a/src/main/target/YUPIF7/target.h
+++ b/src/main/target/YUPIF7/target.h
@@ -40,11 +40,11 @@
 #define SPI1_MOSI_PIN           PA7
 
 #define USE_EXTI
-#define MPU_INT_EXTI            PC4
-#define USE_MPU_DATA_READY_SIGNAL
 #define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 
+#define USE_MPU_DATA_READY_SIGNAL
+
 // ICM 20689
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
@@ -126,7 +126,7 @@
 // *************** ADC *****************************
 #define USE_ADC
 #define ADC1_DMA_STREAM         DMA2_Stream0
-#define RSSI_ADC_GPIO_PIN               PC0
+#define RSSI_ADC_PIN                    PC0
 #define VBAT_ADC_PIN                    PC1
 #define CURRENT_METER_ADC_PIN           PC2
 #define CURRENT_METER_SCALE_DEFAULT     235
diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h
index 9ffd9ad5a..fdc9dca04 100644
--- a/src/main/target/common_defaults_post.h
+++ b/src/main/target/common_defaults_post.h
@@ -257,3 +257,15 @@
 #else
 #define MAX_GYRODEV_COUNT 1
 #endif
+
+#ifdef USE_VCP
+#ifndef USB_DETECT_PIN
+#define USB_DETECT_PIN NONE
+#endif
+#ifndef USB_MSC_BUTTON_PIN
+#define USB_MSC_BUTTON_PIN NONE
+#endif
+#if !defined(MSC_BUTTON_IPU)
+#define MSC_BUTTON_IPU true
+#endif
+#endif
diff --git a/src/test/unit/blackbox_unittest.cc b/src/test/unit/blackbox_unittest.cc
index 59743ded7..02601b410 100644
--- a/src/test/unit/blackbox_unittest.cc
+++ b/src/test/unit/blackbox_unittest.cc
@@ -398,5 +398,6 @@ portSharing_e determinePortSharing(const serialPortConfig_t *, serialPortFunctio
 failsafePhase_e failsafePhase(void) {return FAILSAFE_IDLE;}
 bool rxAreFlightChannelsValid(void) {return false;}
 bool rxIsReceivingSignal(void) {return false;}
+bool isRssiConfigured(void) {return false;}
 
 }