diff --git a/src/main/target/BETAFPVF411/target.mk b/src/main/target/BETAFPVF411/target.mk
index 2eafab1ba8..ab77872afb 100644
--- a/src/main/target/BETAFPVF411/target.mk
+++ b/src/main/target/BETAFPVF411/target.mk
@@ -4,7 +4,6 @@ FEATURES       = VCP ONBOARDFLASH
 TARGET_SRC = \
             drivers/accgyro/accgyro_mpu.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \
-            drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
             drivers/accgyro/accgyro_spi_bmi270.c \
             drivers/barometer/barometer_bmp085.c \
             drivers/barometer/barometer_bmp280.c \
diff --git a/src/main/target/FLYWOOF411_5IN1_AIO/target.mk b/src/main/target/FLYWOOF411_5IN1_AIO/target.mk
index a69689a1d8..a0f0b8aff2 100644
--- a/src/main/target/FLYWOOF411_5IN1_AIO/target.mk
+++ b/src/main/target/FLYWOOF411_5IN1_AIO/target.mk
@@ -3,24 +3,23 @@ F411_TARGETS    += $(TARGET)
 FEATURES        += VCP
 
 TARGET_SRC = \
-                        drivers/accgyro/accgyro_mpu.c \
-                        drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
-                        drivers/accgyro/accgyro_spi_bmi270.c \
-                        drivers/accgyro/accgyro_spi_icm20689.c \
-                        drivers/accgyro/accgyro_spi_icm426xx.c \
-                        drivers/accgyro/accgyro_spi_mpu6000.c \
-                        drivers/barometer/barometer_bmp085.c \
-                        drivers/barometer/barometer_bmp280.c \
-                        drivers/barometer/barometer_ms5611.c \
-                        drivers/compass/compass_hmc5883l.c \
+            drivers/accgyro/accgyro_mpu.c \
+            drivers/accgyro/accgyro_spi_bmi270.c \
+            drivers/accgyro/accgyro_spi_icm20689.c \
+            drivers/accgyro/accgyro_spi_icm426xx.c \
+            drivers/accgyro/accgyro_spi_mpu6000.c \
+            drivers/barometer/barometer_bmp085.c \
+            drivers/barometer/barometer_bmp280.c \
+            drivers/barometer/barometer_ms5611.c \
+            drivers/compass/compass_hmc5883l.c \
             drivers/compass/compass_qmc5883l.c \
             drivers/max7456.c \
             drivers/rx/rx_cc2500.c \
-						rx/cc2500_common.c \
+            rx/cc2500_common.c \
             rx/cc2500_frsky_shared.c \
             rx/cc2500_frsky_d.c \
-						rx/cc2500_frsky_x.c \
-						rx/cc2500_redpine.c \
+            rx/cc2500_frsky_x.c \
+            rx/cc2500_redpine.c \
             rx/cc2500_sfhss.c\
             drivers/rx/rx_a7105.c \
-						drivers/light_ws2811strip.c
+            drivers/light_ws2811strip.c
diff --git a/src/main/target/FOXEERF745_AIO/target.mk b/src/main/target/FOXEERF745_AIO/target.mk
index 348e36c404..01b1543813 100644
--- a/src/main/target/FOXEERF745_AIO/target.mk
+++ b/src/main/target/FOXEERF745_AIO/target.mk
@@ -2,7 +2,6 @@ F7X5XG_TARGETS += $(TARGET)
 FEATURES       += VCP ONBOARDFLASH
 
 TARGET_SRC = \
-            drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
             drivers/accgyro/accgyro_spi_bmi270.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \
             drivers/accgyro/accgyro_mpu.c \
diff --git a/src/main/target/IFLIGHT_F745_AIO_V2/target.mk b/src/main/target/IFLIGHT_F745_AIO_V2/target.mk
index a2ee8ce99b..7cfd60c081 100644
--- a/src/main/target/IFLIGHT_F745_AIO_V2/target.mk
+++ b/src/main/target/IFLIGHT_F745_AIO_V2/target.mk
@@ -2,7 +2,6 @@ F7X5XG_TARGETS += $(TARGET)
 FEATURES       += VCP ONBOARDFLASH
 
 TARGET_SRC = \
-            drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
             drivers/accgyro/accgyro_spi_bmi270.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \
             drivers/accgyro/accgyro_mpu.c \
diff --git a/src/main/target/NBD_INFINITYAIOV2PRO/target.mk b/src/main/target/NBD_INFINITYAIOV2PRO/target.mk
index 6c7c440f2d..eb8fe54ef3 100644
--- a/src/main/target/NBD_INFINITYAIOV2PRO/target.mk
+++ b/src/main/target/NBD_INFINITYAIOV2PRO/target.mk
@@ -2,14 +2,13 @@ F7X5XG_TARGETS += $(TARGET)
 FEATURES       += VCP ONBOARDFLASH
 
 TARGET_SRC = \
-            drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
             drivers/accgyro/accgyro_spi_bmi270.c \
             drivers/light_ws2811strip.c \
             drivers/max7456.c \
-drivers/compass/compass_fake.c \
-drivers/compass/compass_ak8963.c \
-drivers/compass/compass_ak8975.c \
-drivers/compass/compass_hmc5883l.c \
-drivers/compass/compass_lis3mdl.c \
-drivers/compass/compass_qmc5883l.c \
+            drivers/compass/compass_fake.c \
+            drivers/compass/compass_ak8963.c \
+            drivers/compass/compass_ak8975.c \
+            drivers/compass/compass_hmc5883l.c \
+            drivers/compass/compass_lis3mdl.c \
+            drivers/compass/compass_qmc5883l.c \
 
diff --git a/src/main/target/SKYSTARSF7HD/target.mk b/src/main/target/SKYSTARSF7HD/target.mk
index a9c5cf138f..1f9b3af4ff 100644
--- a/src/main/target/SKYSTARSF7HD/target.mk
+++ b/src/main/target/SKYSTARSF7HD/target.mk
@@ -2,8 +2,7 @@ F7X2RE_TARGETS += $(TARGET)
 FEATURES       += VCP ONBOARDFLASH
 
 TARGET_SRC = \
-						drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
-						drivers/accgyro/accgyro_spi_bmi270.c \
+            drivers/accgyro/accgyro_spi_bmi270.c \
             drivers/accgyro/accgyro_mpu.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \
             drivers/barometer/barometer_bmp085.c \
@@ -11,5 +10,5 @@ TARGET_SRC = \
             drivers/barometer/barometer_ms5611.c \
             drivers/compass/compass_hmc5883l.c \
             drivers/compass/compass_qmc5883l.c \
-						drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip.c \
             drivers/max7456.c
diff --git a/src/main/target/SKYSTARSF7HDPRO/target.mk b/src/main/target/SKYSTARSF7HDPRO/target.mk
index 108b015201..383eb5da06 100644
--- a/src/main/target/SKYSTARSF7HDPRO/target.mk
+++ b/src/main/target/SKYSTARSF7HDPRO/target.mk
@@ -2,16 +2,15 @@ F7X2RE_TARGETS  += $(TARGET)
 FEATURES        += VCP ONBOARDFLASH
 
 TARGET_SRC = \
-						drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
-						drivers/accgyro/accgyro_spi_bmi270.c \
-						drivers/accgyro/accgyro_spi_mpu6000.c \
+            drivers/accgyro/accgyro_spi_bmi270.c \
+            drivers/accgyro/accgyro_spi_mpu6000.c \
             drivers/accgyro/accgyro_mpu.c \
-						drivers/accgyro/accgyro_mpu6500.c \
-						drivers/accgyro/accgyro_spi_mpu6500.c \
+            drivers/accgyro/accgyro_mpu6500.c \
+            drivers/accgyro/accgyro_spi_mpu6500.c \
             drivers/barometer/barometer_bmp280.c \
           	drivers/barometer/barometer_ms5611.c \
-						drivers/barometer/barometer_bmp085.c \
+            drivers/barometer/barometer_bmp085.c \
             drivers/compass/compass_hmc5883l.c \
             drivers/compass/compass_qmc5883l.c \
-						drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip.c \
             drivers/max7456.c
diff --git a/src/main/target/TMTR_TMOTORF7/target.mk b/src/main/target/TMTR_TMOTORF7/target.mk
index 31b5f262e1..8d266e1396 100644
--- a/src/main/target/TMTR_TMOTORF7/target.mk
+++ b/src/main/target/TMTR_TMOTORF7/target.mk
@@ -1,7 +1,6 @@
 F7X2RE_TARGETS   += $(TARGET)
 FEATURES       = VCP ONBOARDFLASH
 TARGET_SRC = \
-            drivers/accgyro/accgyro_bmi270_maximum_fifo.c \
             drivers/accgyro/accgyro_spi_bmi270.c \
             drivers/accgyro/accgyro_mpu6500.c \
             drivers/accgyro/accgyro_spi_mpu6000.c \