diff --git a/src/main/target/AIKONF7/target.h b/src/main/target/AIKONF7/target.h
index f738d688a88..b29a2c9366c 100644
--- a/src/main/target/AIKONF7/target.h
+++ b/src/main/target/AIKONF7/target.h
@@ -109,15 +109,6 @@
 #define USE_FLASH_M25P16
 #define M25P16_SPI_BUS BUS_SPI3
 #define M25P16_CS_PIN PB0
-#define USE_FLASH_W25M
-#define W25M_SPI_BUS BUS_SPI3
-#define W25M_CS_PIN PB0
-#define USE_FLASH_W25M02G
-#define W25M02G_SPI_BUS BUS_SPI3
-#define W25M02G_CS_PIN PB0
-#define USE_FLASH_W25M512
-#define W25M512_SPI_BUS BUS_SPI3
-#define W25M512_CS_PIN PB0
 #define USE_FLASH_W25N01G
 #define W25N01G_SPI_BUS BUS_SPI3
 #define W25N01G_CS_PIN PB0
diff --git a/src/main/target/BETAFPVF435/target.h b/src/main/target/BETAFPVF435/target.h
index fa025b9d7fd..db897e42b31 100644
--- a/src/main/target/BETAFPVF435/target.h
+++ b/src/main/target/BETAFPVF435/target.h
@@ -94,15 +94,6 @@
 #define USE_FLASH_W25N01G          // 1Gb NAND flash support
 #define W25N01G_SPI_BUS BUS_SPI2
 #define W25N01G_CS_PIN   FLASH_CS_PIN
-#define USE_FLASH_W25M             // Stacked die support
-#define W25M_SPI_BUS    BUS_SPI2
-#define W25M_CS_PIN   FLASH_CS_PIN
-#define USE_FLASH_W25M512          // 512Kb (256Kb x 2 stacked) NOR flash support
-#define W25M512_SPI_BUS BUS_SPI2
-#define W25M512_CS_PIN   FLASH_CS_PIN
-#define USE_FLASH_W25M02G          // 2Gb (1Gb x 2 stacked) NAND flash support
-#define W25M02G_SPI_BUS BUS_SPI2
-#define W25M02G_CS_PIN FLASH_CS_PIN
 
 // *************** OSD *****************************
 #define USE_SPI_DEVICE_3
@@ -143,7 +134,6 @@
 #define UART3_TX_PIN            PB10
 #define USE_UART_INVERTER
 #define INVERTER_PIN_UART3_RX   PC9
-#define INVERTER_PIN_USART3_RX   PC9
 
 #define USE_UART4
 #define UART4_RX_PIN            PA1
@@ -167,9 +157,9 @@
 #define USE_ADC
 #define ADC_INSTANCE            ADC1
 #define ADC1_DMA_STREAM             DMA2_CHANNEL5
-#define ADC_CHANNEL1_PIN        PC2
-#define ADC_CHANNEL2_PIN        PC1
-#define ADC_CHANNEL3_PIN        PC0
+#define ADC_CHANNEL_1_PIN       PC2
+#define ADC_CHANNEL_2_PIN       PC1
+#define ADC_CHANNEL_3_PIN       PC0
 #define VBAT_ADC_CHANNEL            ADC_CHN_1
 #define CURRENT_METER_ADC_CHANNEL   ADC_CHN_2
 #define RSSI_ADC_CHANNEL        ADC_CHN_3
diff --git a/src/main/target/BROTHERHOBBYF405V3/target.h b/src/main/target/BROTHERHOBBYF405V3/target.h
index acf1f82a6b2..b4b977f8d73 100644
--- a/src/main/target/BROTHERHOBBYF405V3/target.h
+++ b/src/main/target/BROTHERHOBBYF405V3/target.h
@@ -116,15 +116,6 @@
 #define USE_FLASH_M25P16
 #define M25P16_SPI_BUS BUS_SPI3
 #define M25P16_CS_PIN PA15
-#define USE_FLASH_W25M
-#define W25M_SPI_BUS BUS_SPI3
-#define W25M_CS_PIN PA15
-#define USE_FLASH_W25M02G
-#define W25M02G_SPI_BUS BUS_SPI3
-#define W25M02G_CS_PIN PA15
-#define USE_FLASH_W25M512
-#define W25M512_SPI_BUS BUS_SPI3
-#define W25M512_CS_PIN PA15
 #define USE_FLASH_W25N01G
 #define W25N01G_SPI_BUS BUS_SPI3
 #define W25N01G_CS_PIN PA15
diff --git a/src/main/target/IFLIGHT_H743_AIO_V2/target.h b/src/main/target/IFLIGHT_H743_AIO_V2/target.h
index c3900376686..a5257993798 100644
--- a/src/main/target/IFLIGHT_H743_AIO_V2/target.h
+++ b/src/main/target/IFLIGHT_H743_AIO_V2/target.h
@@ -24,7 +24,7 @@
 
 #define LED0                    PC13
 
-#define BEEPER_PIN              PD2
+#define BEEPER                  PD2
 #define BEEPER_INVERTED
 
 // *************** SPI1 Gyro & ACC *******************
diff --git a/src/main/target/JHEH7AIO/target.h b/src/main/target/JHEH7AIO/target.h
index 00ecf856e23..a3d0bf6a419 100644
--- a/src/main/target/JHEH7AIO/target.h
+++ b/src/main/target/JHEH7AIO/target.h
@@ -24,7 +24,7 @@
 
 #define LED0                    PC13
 
-#define BEEPER_PIN              PD15
+#define BEEPER                  PD15
 #define BEEPER_INVERTED
 
 // *************** SPI1 Gyro & ACC *******************
diff --git a/src/main/target/PRINCIPIOTF7/target.h b/src/main/target/PRINCIPIOTF7/target.h
index aa486d6af25..0208f55a361 100644
--- a/src/main/target/PRINCIPIOTF7/target.h
+++ b/src/main/target/PRINCIPIOTF7/target.h
@@ -128,15 +128,6 @@
 #define USE_FLASH_M25P16
 #define M25P16_SPI_BUS BUS_SPI2
 #define M25P16_CS_PIN PB12
-#define USE_FLASH_W25M
-#define W25M_SPI_BUS BUS_SPI2
-#define W25M_CS_PIN PB12
-#define USE_FLASH_W25M02G
-#define W25M02G_SPI_BUS BUS_SPI2
-#define W25M02G_CS_PIN PB12
-#define USE_FLASH_W25M512
-#define W25M512_SPI_BUS BUS_SPI2
-#define W25M512_CS_PIN PB12
 #define USE_FLASH_W25N01G
 #define W25N01G_SPI_BUS BUS_SPI2
 #define W25N01G_CS_PIN PB12
diff --git a/src/main/target/RADIOLINKF405/target.h b/src/main/target/RADIOLINKF405/target.h
index 6665a46a4f8..9a1afd47739 100644
--- a/src/main/target/RADIOLINKF405/target.h
+++ b/src/main/target/RADIOLINKF405/target.h
@@ -162,7 +162,7 @@
 
 #define MAX_PWM_OUTPUT_PORTS    8
 
-#define USE_SERIAL_3WAY_BLHELI_INTERFACE
+#define USE_SERIAL_4WAY_BLHELI_INTERFACE
 #define USE_DSHOT
 #define USE_DSHOT_DMAR
 #define USE_ESC_SENSOR
diff --git a/src/utils/bf2inav.py b/src/utils/bf2inav.py
index 8309cb1d756..c810b53d888 100755
--- a/src/utils/bf2inav.py
+++ b/src/utils/bf2inav.py
@@ -468,9 +468,6 @@ def writeTargetH(folder, map):
             # TODO: add more drivers
             suppored_flash_chips = [
                 'M25P16',
-                'W25M',
-                'W25M02G',
-                'W25M512',
                 'W25N01G',
                 'W25N02K',
             ]