diff --git a/Makefile b/Makefile
index 8b8183ba4..41de1dd7a 100644
--- a/Makefile
+++ b/Makefile
@@ -635,10 +635,6 @@ COMMON_SRC = \
             sensors/compass.c \
             sensors/gyro.c \
             sensors/initialisation.c \
-            $(CMSIS_SRC) \
-            $(DEVICE_STDPERIPH_SRC)
-
-HIGHEND_SRC = \
             blackbox/blackbox.c \
             blackbox/blackbox_io.c \
             cms/cms.c \
@@ -679,7 +675,10 @@ HIGHEND_SRC = \
             sensors/esc_sensor.c \
             io/vtx_string.c \
             io/vtx_smartaudio.c \
-            io/vtx_tramp.c
+            io/vtx_tramp.c \
+            $(CMSIS_SRC) \
+            $(DEVICE_STDPERIPH_SRC)
+
 
 SPEED_OPTIMISED_SRC := ""
 SIZE_OPTIMISED_SRC  := ""
@@ -872,13 +871,8 @@ TARGET_SRC += \
             io/flashfs.c
 endif
 
-ifeq ($(TARGET),$(filter $(TARGET),$(F7_TARGETS) $(F4_TARGETS) $(F3_TARGETS)))
-TARGET_SRC += $(HIGHEND_SRC)
-else ifneq ($(filter HIGHEND,$(FEATURES)),)
-TARGET_SRC += $(HIGHEND_SRC)
-endif
-
 TARGET_SRC += $(COMMON_SRC)
+
 #excludes
 ifeq ($(TARGET),$(filter $(TARGET),$(F7_TARGETS)))
 TARGET_SRC   := $(filter-out ${F7EXCLUDES}, $(TARGET_SRC))
diff --git a/src/main/target/ALIENFLIGHTF1/target.mk b/src/main/target/ALIENFLIGHTF1/target.mk
index 844b4982e..cc553693d 100644
--- a/src/main/target/ALIENFLIGHTF1/target.mk
+++ b/src/main/target/ALIENFLIGHTF1/target.mk
@@ -1,5 +1,4 @@
 F1_TARGETS  += $(TARGET)
-FEATURES    = HIGHEND 
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
diff --git a/src/main/target/CC3D/target.mk b/src/main/target/CC3D/target.mk
index 5682d063d..a9cdd0ad7 100644
--- a/src/main/target/CC3D/target.mk
+++ b/src/main/target/CC3D/target.mk
@@ -1,5 +1,5 @@
 F1_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH HIGHEND VCP
+FEATURES    = ONBOARDFLASH VCP
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
diff --git a/src/main/target/MICROSCISKY/target.mk b/src/main/target/MICROSCISKY/target.mk
index 88034cc60..274eb198d 100644
--- a/src/main/target/MICROSCISKY/target.mk
+++ b/src/main/target/MICROSCISKY/target.mk
@@ -1,5 +1,4 @@
 F1_TARGETS  += $(TARGET)
-FEATURES    = HIGHEND
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
diff --git a/src/main/target/NAZE/target.mk b/src/main/target/NAZE/target.mk
index 48f6e46cf..d9371ed74 100644
--- a/src/main/target/NAZE/target.mk
+++ b/src/main/target/NAZE/target.mk
@@ -1,5 +1,5 @@
 F1_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH HIGHEND 
+FEATURES    = ONBOARDFLASH
 
 TARGET_SRC = \
             drivers/accgyro_adxl345.c \
diff --git a/src/main/target/STM32F3DISCOVERY/target.mk b/src/main/target/STM32F3DISCOVERY/target.mk
index 6f1f506bf..181527be3 100644
--- a/src/main/target/STM32F3DISCOVERY/target.mk
+++ b/src/main/target/STM32F3DISCOVERY/target.mk
@@ -1,5 +1,5 @@
 F3_TARGETS  += $(TARGET)
-FEATURES    = VCP SDCARD HIGHEND
+FEATURES    = VCP SDCARD
 
 TARGET_SRC = \
             drivers/accgyro_adxl345.c \