diff --git a/Makefile b/Makefile
index 4117bbda91..8669fcf10d 100644
--- a/Makefile
+++ b/Makefile
@@ -478,6 +478,9 @@ HIGHEND_SRC = \
             blackbox/blackbox_io.c \
             common/colorconversion.c \
             drivers/display_ug2864hsweg01.c \
+            drivers/light_ws2811strip.c \
+            drivers/serial_softserial.c \
+            drivers/sonar_hcsr04.c \
             flight/gtune.c \
             flight/navigation.c \
             flight/gps_conversion.c \
@@ -520,7 +523,7 @@ STM32F10x_COMMON_SRC = \
             drivers/dma.c \
             drivers/gpio_stm32f10x.c \
             drivers/inverter.c \
-            drivers/serial_softserial.c \
+            drivers/light_ws2811strip_stm32f10x.c \
             drivers/serial_uart_stm32f10x.c \
             drivers/system_stm32f10x.c \
             drivers/timer_stm32f10x.c
@@ -542,15 +545,14 @@ STM32F4xx_COMMON_SRC = \
             target/system_stm32f4xx.c \
             drivers/accgyro_mpu.c \
             drivers/adc_stm32f4xx.c \
-            drivers/adc_stm32f4xx.c \
             drivers/bus_i2c_stm32f10x.c \
+            drivers/dma_stm32f4xx.c \
             drivers/gpio_stm32f4xx.c \
             drivers/inverter.c \
-            drivers/serial_softserial.c \
+            drivers/light_ws2811strip_stm32f4xx.c \
             drivers/serial_uart_stm32f4xx.c \
             drivers/system_stm32f4xx.c \
-            drivers/timer_stm32f4xx.c \
-            drivers/dma_stm32f4xx.c
+            drivers/timer_stm32f4xx.c
 
 # check if target.mk supplied
 ifeq ($(TARGET),$(filter $(TARGET),$(F4_TARGETS)))
diff --git a/src/main/target/AIORACERF3/target.mk b/src/main/target/AIORACERF3/target.mk
index 9b179afe4b..c5d14b1f50 100644
--- a/src/main/target/AIORACERF3/target.mk
+++ b/src/main/target/AIORACERF3/target.mk
@@ -1,16 +1,13 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP SDCARD
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6500.c \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/barometer_bmp280.c \
-            drivers/compass_ak8963.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_usb_vcp.c \
-            drivers/transponder_ir.c \
-            drivers/transponder_ir_stm32f30x.c \
-            io/transponder_ir.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP SDCARD
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6500.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/barometer_bmp280.c \
+            drivers/compass_ak8963.c \
+            drivers/transponder_ir.c \
+            drivers/transponder_ir_stm32f30x.c \
+            io/transponder_ir.c
+
diff --git a/src/main/target/AIR32/target.mk b/src/main/target/AIR32/target.mk
index 7151bafad9..8246f9de4e 100644
--- a/src/main/target/AIR32/target.mk
+++ b/src/main/target/AIR32/target.mk
@@ -7,8 +7,5 @@ TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/barometer_ms5611.c \
             drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/inverter.c \
-            drivers/serial_softserial.c
+            drivers/inverter.c
 
diff --git a/src/main/target/AIRHEROF3/target.mk b/src/main/target/AIRHEROF3/target.mk
index ee2caa7c1c..29d50f9903 100755
--- a/src/main/target/AIRHEROF3/target.mk
+++ b/src/main/target/AIRHEROF3/target.mk
@@ -6,8 +6,4 @@ TARGET_SRC = \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
             drivers/barometer_bmp280.c \
-            drivers/barometer_spi_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/sonar_hcsr04.c \
-            drivers/serial_softserial.c
+            drivers/barometer_spi_bmp280.c
diff --git a/src/main/target/ALIENFLIGHTF1/target.mk b/src/main/target/ALIENFLIGHTF1/target.mk
index c3a0ba80e5..844b4982e7 100644
--- a/src/main/target/ALIENFLIGHTF1/target.mk
+++ b/src/main/target/ALIENFLIGHTF1/target.mk
@@ -3,6 +3,4 @@ FEATURES    = HIGHEND
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6050.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c
+            drivers/accgyro_mpu6050.c
diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk
index 90e0b83f10..e5c79a59a3 100644
--- a/src/main/target/ALIENFLIGHTF3/target.mk
+++ b/src/main/target/ALIENFLIGHTF3/target.mk
@@ -6,6 +6,5 @@ TARGET_SRC = \
             drivers/accgyro_mpu6050.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
-            drivers/compass_ak8963.c \
-            drivers/sonar_hcsr04.c
+            drivers/compass_ak8963.c
 
diff --git a/src/main/target/ALIENFLIGHTF4/target.mk b/src/main/target/ALIENFLIGHTF4/target.mk
index edd75eefb3..4b9a0ce059 100644
--- a/src/main/target/ALIENFLIGHTF4/target.mk
+++ b/src/main/target/ALIENFLIGHTF4/target.mk
@@ -7,7 +7,5 @@ TARGET_SRC = \
             drivers/barometer_bmp280.c \
             drivers/barometer_ms5611.c \
             drivers/compass_ak8963.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/BETAFLIGHTF3/target.mk b/src/main/target/BETAFLIGHTF3/target.mk
index 022c21a259..63f46f10be 100755
--- a/src/main/target/BETAFLIGHTF3/target.mk
+++ b/src/main/target/BETAFLIGHTF3/target.mk
@@ -9,9 +9,5 @@ TARGET_SRC = \
             drivers/compass_ak8975.c \
             drivers/compass_hmc5883l.c \
             drivers/display_ug2864hsweg01.h \
-            drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c
+            drivers/flash_m25p16.c
 
diff --git a/src/main/target/BLUEJAYF4/target.mk b/src/main/target/BLUEJAYF4/target.mk
index d0a982faad..5714bce5b3 100644
--- a/src/main/target/BLUEJAYF4/target.mk
+++ b/src/main/target/BLUEJAYF4/target.mk
@@ -4,7 +4,5 @@ FEATURES        += SDCARD VCP ONBOARDFLASH
 TARGET_SRC = \
             drivers/accgyro_spi_mpu6500.c \
             drivers/accgyro_mpu6500.c \
-            drivers/barometer_ms5611.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
+            drivers/barometer_ms5611.c
 
diff --git a/src/main/target/CC3D/target.mk b/src/main/target/CC3D/target.mk
index 7bf5bc80b3..5682d063da 100644
--- a/src/main/target/CC3D/target.mk
+++ b/src/main/target/CC3D/target.mk
@@ -7,8 +7,5 @@ TARGET_SRC = \
             drivers/barometer_bmp085.c \
             drivers/barometer_bmp280.c \
             drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/CHEBUZZF3/target.mk b/src/main/target/CHEBUZZF3/target.mk
index 63e6409e3a..3d89185d02 100644
--- a/src/main/target/CHEBUZZF3/target.mk
+++ b/src/main/target/CHEBUZZF3/target.mk
@@ -2,7 +2,6 @@ F3_TARGETS  += $(TARGET)
 FEATURES    = VCP SDCARD
 
 TARGET_SRC = \
-            drivers/light_ws2811strip.c \
             drivers/accgyro_l3gd20.c \
             drivers/accgyro_lsm303dlhc.c \
             drivers/compass_hmc5883l.c \
diff --git a/src/main/target/COLIBRI/target.mk b/src/main/target/COLIBRI/target.mk
index a3d0a413d8..1a012d9871 100644
--- a/src/main/target/COLIBRI/target.mk
+++ b/src/main/target/COLIBRI/target.mk
@@ -5,7 +5,5 @@ HSE_VALUE       = 16000000
 TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c \
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk
index 1632ce30b9..cd18a0b025 100644
--- a/src/main/target/COLIBRI_RACE/target.mk
+++ b/src/main/target/COLIBRI_RACE/target.mk
@@ -12,7 +12,5 @@ TARGET_SRC = \
             drivers/barometer_ms5611.c \
             drivers/compass_ak8963.c \
             drivers/compass_ak8975.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/DOGE/target.mk b/src/main/target/DOGE/target.mk
index 392c55b3f5..700dfe7a53 100644
--- a/src/main/target/DOGE/target.mk
+++ b/src/main/target/DOGE/target.mk
@@ -7,7 +7,5 @@ TARGET_SRC = \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
             drivers/barometer_bmp280.c \
-            drivers/barometer_spi_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
+            drivers/barometer_spi_bmp280.c
 
diff --git a/src/main/target/EUSTM32F103RC/target.h b/src/main/target/EUSTM32F103RC/target.h
index d883641d4f..506e2b05c3 100644
--- a/src/main/target/EUSTM32F103RC/target.h
+++ b/src/main/target/EUSTM32F103RC/target.h
@@ -38,7 +38,7 @@
 
 #define GYRO
 #define USE_FAKE_GYRO
-#define USE_GYRO_L3G4200D
+//#define USE_GYRO_L3G4200D
 //#define USE_GYRO_L3GD20
 //#define USE_GYRO_MPU3050
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/EUSTM32F103RC/target.mk b/src/main/target/EUSTM32F103RC/target.mk
index aa9ccbf8ef..718d86d26b 100644
--- a/src/main/target/EUSTM32F103RC/target.mk
+++ b/src/main/target/EUSTM32F103RC/target.mk
@@ -18,8 +18,5 @@ TARGET_SRC = \
             drivers/barometer_bmp280.c \
             drivers/barometer_ms5611.c \
             drivers/compass_ak8975.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/FURYF3/target.mk b/src/main/target/FURYF3/target.mk
index 7f295bcb0b..1cbb887de4 100644
--- a/src/main/target/FURYF3/target.mk
+++ b/src/main/target/FURYF3/target.mk
@@ -8,9 +8,5 @@ TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
-            drivers/accgyro_spi_icm20689.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/sonar_hcsr04.c \
-            drivers/serial_softserial.c
+            drivers/accgyro_spi_icm20689.c
 
diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk
index 3a821d8252..b35c30a577 100644
--- a/src/main/target/FURYF4/target.mk
+++ b/src/main/target/FURYF4/target.mk
@@ -6,7 +6,5 @@ TARGET_SRC = \
             drivers/accgyro_spi_mpu6500.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_icm20689.c \
-            drivers/barometer_ms5611.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
+            drivers/barometer_ms5611.c
 
diff --git a/src/main/target/IMPULSERCF3/target.mk b/src/main/target/IMPULSERCF3/target.mk
index ec4b5802f2..3064e66d18 100644
--- a/src/main/target/IMPULSERCF3/target.mk
+++ b/src/main/target/IMPULSERCF3/target.mk
@@ -4,7 +4,5 @@ FEATURES    = VCP ONBOARDFLASH
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_spi_mpu6000.c \
-            drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c 
+            drivers/flash_m25p16.c
 
diff --git a/src/main/target/ISHAPEDF3/target.mk b/src/main/target/ISHAPEDF3/target.mk
index 94676e07dc..c322d07e00 100644
--- a/src/main/target/ISHAPEDF3/target.mk
+++ b/src/main/target/ISHAPEDF3/target.mk
@@ -4,8 +4,4 @@ FEATURES    = ONBOARDFLASH
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6500.c \
-            drivers/barometer_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c
+            drivers/barometer_bmp280.c
diff --git a/src/main/target/LUX_RACE/target.mk b/src/main/target/LUX_RACE/target.mk
index 2f6ba2d537..4833b16e4d 100644
--- a/src/main/target/LUX_RACE/target.mk
+++ b/src/main/target/LUX_RACE/target.mk
@@ -5,7 +5,5 @@ TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
-            drivers/accgyro_mpu6500.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
+            drivers/accgyro_mpu6500.c
 
diff --git a/src/main/target/MICROSCISKY/target.mk b/src/main/target/MICROSCISKY/target.mk
index 02299eedd0..88034cc60a 100644
--- a/src/main/target/MICROSCISKY/target.mk
+++ b/src/main/target/MICROSCISKY/target.mk
@@ -7,6 +7,4 @@ TARGET_SRC = \
             drivers/barometer_bmp085.c \
             drivers/barometer_bmp280.c \
             drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c
+            drivers/compass_hmc5883l.c
diff --git a/src/main/target/MOTOLAB/target.mk b/src/main/target/MOTOLAB/target.mk
index 596dedfbc3..35a228d5bd 100644
--- a/src/main/target/MOTOLAB/target.mk
+++ b/src/main/target/MOTOLAB/target.mk
@@ -6,8 +6,5 @@ TARGET_SRC = \
             drivers/accgyro_mpu6050.c \
             drivers/accgyro_spi_mpu6000.c \
             drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/NAZE/target.mk b/src/main/target/NAZE/target.mk
index e5fbfe8c95..48f6e46cf4 100644
--- a/src/main/target/NAZE/target.mk
+++ b/src/main/target/NAZE/target.mk
@@ -14,7 +14,4 @@ TARGET_SRC = \
             drivers/barometer_bmp085.c \
             drivers/barometer_bmp280.c \
             drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
+            drivers/compass_hmc5883l.c
diff --git a/src/main/target/OLIMEXINO/target.mk b/src/main/target/OLIMEXINO/target.mk
index 6834b6126a..512ba68ccb 100644
--- a/src/main/target/OLIMEXINO/target.mk
+++ b/src/main/target/OLIMEXINO/target.mk
@@ -6,8 +6,5 @@ TARGET_SRC = \
             drivers/accgyro_mpu6050.c \
             drivers/barometer_bmp085.c \
             drivers/barometer_bmp280.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/OMNIBUS/target.mk b/src/main/target/OMNIBUS/target.mk
index 82cde62266..15622ce337 100644
--- a/src/main/target/OMNIBUS/target.mk
+++ b/src/main/target/OMNIBUS/target.mk
@@ -6,8 +6,6 @@ TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/barometer_bmp280.c \
             drivers/barometer_spi_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
             drivers/serial_usb_vcp.c \
             drivers/transponder_ir.c \
             drivers/transponder_ir_stm32f30x.c \
diff --git a/src/main/target/OMNIBUSF4/target.mk b/src/main/target/OMNIBUSF4/target.mk
index 71d6cb1ce3..18034c1332 100644
--- a/src/main/target/OMNIBUSF4/target.mk
+++ b/src/main/target/OMNIBUSF4/target.mk
@@ -5,8 +5,6 @@ TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/barometer_ms5611.c \
             drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c \
             drivers/max7456.c \
             io/osd.c
 
diff --git a/src/main/target/PIKOBLX/target.mk b/src/main/target/PIKOBLX/target.mk
index 3192c18c4e..922b78405f 100644
--- a/src/main/target/PIKOBLX/target.mk
+++ b/src/main/target/PIKOBLX/target.mk
@@ -4,9 +4,6 @@ FEATURES    = VCP
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_spi_mpu6000.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
             drivers/transponder_ir.c \
             drivers/transponder_ir_stm32f30x.c \
             io/transponder_ir.c
diff --git a/src/main/target/PORT103R/target.mk b/src/main/target/PORT103R/target.mk
index 86cf70fb5e..bb3de6bc72 100644
--- a/src/main/target/PORT103R/target.mk
+++ b/src/main/target/PORT103R/target.mk
@@ -21,8 +21,5 @@ TARGET_SRC = \
             drivers/barometer_bmp280.c \
             drivers/barometer_ms5611.c \
             drivers/compass_ak8975.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/RACEBASE/target.mk b/src/main/target/RACEBASE/target.mk
index 6e4711c5da..1e9cf90ba6 100755
--- a/src/main/target/RACEBASE/target.mk
+++ b/src/main/target/RACEBASE/target.mk
@@ -1,12 +1,10 @@
 F3_TARGETS  += $(TARGET)
 
-FEATURES    = ONBOARDFLASH
+FEATURES    = ONBOARDFLASH
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_spi_mpu6000.c \
             drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
             drivers/max7456.c \
             io/osd.c
diff --git a/src/main/target/RCEXPLORERF3/target.mk b/src/main/target/RCEXPLORERF3/target.mk
index 2a702724c3..0b7a890b66 100644
--- a/src/main/target/RCEXPLORERF3/target.mk
+++ b/src/main/target/RCEXPLORERF3/target.mk
@@ -2,14 +2,11 @@ F3_TARGETS  += $(TARGET)
 FEATURES    = VCP
 
 TARGET_SRC = \
-		   drivers/accgyro_mpu.c \
-		   drivers/accgyro_spi_mpu6000.c \
-		   drivers/barometer_ms5611.c \
-		   drivers/compass_hmc5883l.c \
-		   drivers/compass_ak8975.c \
-		   drivers/display_ug2864hsweg01.c \
-		   drivers/serial_usb_vcp.c \
-		   drivers/flash_m25p16.c \
-		   drivers/light_ws2811strip.c \
-		   drivers/light_ws2811strip_stm32f30x.c \
-		   drivers/sonar_hcsr04.c
+           drivers/accgyro_mpu.c \
+           drivers/accgyro_spi_mpu6000.c \
+           drivers/barometer_ms5611.c \
+           drivers/compass_hmc5883l.c \
+           drivers/compass_ak8975.c \
+           drivers/display_ug2864hsweg01.c \
+           drivers/serial_usb_vcp.c \
+           drivers/flash_m25p16.c
diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk
index e3fc89c21c..2711b19dac 100644
--- a/src/main/target/REVO/target.mk
+++ b/src/main/target/REVO/target.mk
@@ -4,6 +4,4 @@ FEATURES       += VCP ONBOARDFLASH
 TARGET_SRC = \
             drivers/accgyro_spi_mpu6000.c \
             drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
+            drivers/compass_hmc5883l.c
diff --git a/src/main/target/REVONANO/target.mk b/src/main/target/REVONANO/target.mk
index af9876e351..7db95a0ae3 100644
--- a/src/main/target/REVONANO/target.mk
+++ b/src/main/target/REVONANO/target.mk
@@ -2,5 +2,5 @@ F411_TARGETS   += $(TARGET)
 FEATURES       += VCP ONBOARDFLASH
 
 TARGET_SRC = \
-		   drivers/accgyro_spi_mpu9250.c \
-		   drivers/barometer_ms5611.c
\ No newline at end of file
+           drivers/accgyro_spi_mpu9250.c \
+           drivers/barometer_ms5611.c
\ No newline at end of file
diff --git a/src/main/target/RMDO/target.mk b/src/main/target/RMDO/target.mk
index ec0fc084df..81b0472171 100644
--- a/src/main/target/RMDO/target.mk
+++ b/src/main/target/RMDO/target.mk
@@ -5,9 +5,5 @@ TARGET_FLAGS = -DSPRACINGF3
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6050.c \
-            drivers/barometer_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c
+            drivers/barometer_bmp280.c
 
diff --git a/src/main/target/SINGULARITY/target.mk b/src/main/target/SINGULARITY/target.mk
index bdae168d91..13c531b9c7 100644
--- a/src/main/target/SINGULARITY/target.mk
+++ b/src/main/target/SINGULARITY/target.mk
@@ -4,9 +4,6 @@ FEATURES    = VCP ONBOARDFLASH
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6050.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
             drivers/vtx_rtc6705.c \
             io/vtx.c
 
diff --git a/src/main/target/SIRINFPV/target.mk b/src/main/target/SIRINFPV/target.mk
index 19cc56e950..eac7fbb6ec 100644
--- a/src/main/target/SIRINFPV/target.mk
+++ b/src/main/target/SIRINFPV/target.mk
@@ -10,8 +10,6 @@ TARGET_SRC = \
             drivers/compass_ak8975.c \
             drivers/compass_hmc5883l.c \
             drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
             drivers/vtx_soft_spi_rtc6705.c \
             drivers/max7456.c \
             io/osd.c
diff --git a/src/main/target/SOULF4/target.mk b/src/main/target/SOULF4/target.mk
index d7f3c34560..0b39ad0978 100644
--- a/src/main/target/SOULF4/target.mk
+++ b/src/main/target/SOULF4/target.mk
@@ -1,8 +1,6 @@
-F405_TARGETS   += $(TARGET)
-FEATURES       += VCP ONBOARDFLASH
-
-TARGET_SRC = \
-            drivers/accgyro_spi_mpu6000.c \
-   	    drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
-
+F405_TARGETS   += $(TARGET)
+FEATURES       += VCP ONBOARDFLASH
+
+TARGET_SRC = \
+            drivers/accgyro_spi_mpu6000.c
+
diff --git a/src/main/target/SPARKY/target.mk b/src/main/target/SPARKY/target.mk
index f4de2539f2..e57a5cff45 100644
--- a/src/main/target/SPARKY/target.mk
+++ b/src/main/target/SPARKY/target.mk
@@ -6,7 +6,5 @@ TARGET_SRC = \
             drivers/accgyro_mpu6050.c \
             drivers/barometer_ms5611.c \
             drivers/barometer_bmp280.c \
-            drivers/compass_ak8975.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
+            drivers/compass_ak8975.c
 
diff --git a/src/main/target/SPARKY2/target.mk b/src/main/target/SPARKY2/target.mk
index 56f2b2f444..60869f5e64 100644
--- a/src/main/target/SPARKY2/target.mk
+++ b/src/main/target/SPARKY2/target.mk
@@ -6,7 +6,5 @@ TARGET_SRC = \
             drivers/barometer_bmp280.c \
             drivers/barometer_ms5611.c \
             drivers/compass_ak8963.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk
index 2d8711dfb6..5b3a330295 100644
--- a/src/main/target/SPRACINGF3/target.mk
+++ b/src/main/target/SPRACINGF3/target.mk
@@ -8,9 +8,5 @@ TARGET_SRC = \
             drivers/barometer_bmp085.c \
             drivers/barometer_bmp280.c \
             drivers/compass_ak8975.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c
+            drivers/compass_hmc5883l.c
 
diff --git a/src/main/target/SPRACINGF3EVO/target.mk b/src/main/target/SPRACINGF3EVO/target.mk
index 086683412d..937cd6bf4d 100644
--- a/src/main/target/SPRACINGF3EVO/target.mk
+++ b/src/main/target/SPRACINGF3EVO/target.mk
@@ -7,8 +7,6 @@ TARGET_SRC = \
             drivers/accgyro_spi_mpu6500.c \
             drivers/barometer_bmp280.c \
             drivers/compass_ak8963.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
             drivers/serial_usb_vcp.c \
             drivers/transponder_ir.c \
             drivers/transponder_ir_stm32f30x.c \
diff --git a/src/main/target/SPRACINGF3MINI/target.mk b/src/main/target/SPRACINGF3MINI/target.mk
index 5c16c88a7d..af1bbcfe30 100644
--- a/src/main/target/SPRACINGF3MINI/target.mk
+++ b/src/main/target/SPRACINGF3MINI/target.mk
@@ -8,11 +8,6 @@ TARGET_SRC = \
             drivers/compass_ak8975.c \
             drivers/compass_hmc5883l.c \
             drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/serial_usb_vcp.c \
-            drivers/sonar_hcsr04.c \
             drivers/transponder_ir.c \
             drivers/transponder_ir_stm32f30x.c \
             io/transponder_ir.c
diff --git a/src/main/target/STM32F3DISCOVERY/target.mk b/src/main/target/STM32F3DISCOVERY/target.mk
index db3fa135ce..971ddf04a2 100644
--- a/src/main/target/STM32F3DISCOVERY/target.mk
+++ b/src/main/target/STM32F3DISCOVERY/target.mk
@@ -25,7 +25,5 @@ TARGET_SRC = \
             drivers/compass_ak8975.c \
             drivers/compass_hmc5883l.c \
             drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
             drivers/max7456.c \
-            drivers/sonar_hcsr04.c \
             io/osd.c
diff --git a/src/main/target/VRRACE/target.mk b/src/main/target/VRRACE/target.mk
index ed853fd62b..b1fcd2be62 100644
--- a/src/main/target/VRRACE/target.mk
+++ b/src/main/target/VRRACE/target.mk
@@ -1,7 +1,7 @@
-F405_TARGETS   += $(TARGET)
-FEATURES       += VCP
-
-TARGET_SRC = \
-            drivers/accgyro_spi_mpu6000.c \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/accgyro_mpu6500.c
+F405_TARGETS   += $(TARGET)
+FEATURES       += VCP
+
+TARGET_SRC = \
+            drivers/accgyro_spi_mpu6000.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/accgyro_mpu6500.c
diff --git a/src/main/target/X_RACERSPI/target.mk b/src/main/target/X_RACERSPI/target.mk
index 4604ddb4cb..00e74dcf20 100644
--- a/src/main/target/X_RACERSPI/target.mk
+++ b/src/main/target/X_RACERSPI/target.mk
@@ -7,9 +7,5 @@ TARGET_SRC = \
             drivers/compass_ak8975.c \
             drivers/compass_hmc5883l.c \
             drivers/display_ug2864hsweg01.h \
-            drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c
+            drivers/flash_m25p16.c
 
diff --git a/src/main/target/ZCOREF3/target.mk b/src/main/target/ZCOREF3/target.mk
index 39b7b5d000..54107898fd 100644
--- a/src/main/target/ZCOREF3/target.mk
+++ b/src/main/target/ZCOREF3/target.mk
@@ -5,7 +5,5 @@ TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
-            drivers/barometer_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
+            drivers/barometer_bmp280.c