diff --git a/Makefile b/Makefile
index b5ff167038..93b38754ae 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,6 @@ COMMON_SRC = build_config.c \
 		   drivers/gyro_sync.c \
 		   drivers/dma.c \
 		   drivers/buf_writer.c \
-		   drivers/serial_escserial.c \
 		   io/beeper.c \
 		   io/rc_controls.c \
 		   io/rc_curves.c \
@@ -609,6 +608,7 @@ COLIBRI_RACE_SRC = \
 		   drivers/display_ug2864hsweg01.c \
 		   drivers/light_ws2811strip.c \
 		   drivers/light_ws2811strip_stm32f30x.c \
+		   drivers/serial_escserial.c \
 		   drivers/serial_usb_vcp.c \
 		   $(HIGHEND_SRC) \
 		   $(COMMON_SRC) \
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index f899552029..089d1e89b7 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -47,7 +47,6 @@
 #include "drivers/pwm_rx.h"
 #include "drivers/sdcard.h"
 #include "drivers/gyro_sync.h"
-#include "drivers/serial_escserial.h"
 
 #include "drivers/buf_writer.h"
 
diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index 2b2c6269f0..cbd629fbf8 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -44,7 +44,6 @@
 #include "drivers/gyro_sync.h"
 #include "drivers/sdcard.h"
 #include "drivers/buf_writer.h"
-#include "drivers/serial_escserial.h"
 #include "rx/rx.h"
 #include "rx/msp.h"
 
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index ca89307f7e..79365c62e5 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -51,9 +51,6 @@
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
 // Using MPU6050 for the moment.
 #define GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 715c588f5e..c3639e4d9f 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -27,8 +27,6 @@
 #define INVERTER_PERIPHERAL RCC_APB2Periph_GPIOB
 #define INVERTER_USART USART1
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
 #define BEEP_GPIO GPIOA
 #define BEEP_PIN Pin_15 // PA15 (Beeper)
diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h
index 9a2077af08..ccc9fa9975 100644
--- a/src/main/target/IRCFUSIONF3/target.h
+++ b/src/main/target/IRCFUSIONF3/target.h
@@ -38,9 +38,6 @@
 #define USE_MAG_DATA_READY_SIGNAL
 #define ENSURE_MAG_DATA_READY_IS_HIGH
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
 
 #define GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index 13aeb63c16..3b19243aa6 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -58,9 +58,6 @@
 
 #define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
 #define GYRO
 #define USE_GYRO_MPU6500
 #define USE_GYRO_SPI_MPU6500
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index 97bd1d8054..a7961aa4c4 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -35,9 +35,6 @@
 
 #define USABLE_TIMER_CHANNEL_COUNT 9
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
 // MPU6050 interrupts
 #define EXTI15_10_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 #define USE_MPU_DATA_READY_SIGNAL
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 701d9e2da4..239d03c667 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -29,9 +29,6 @@
 #define LED1_PIN    Pin_4 // PB4 (LED)
 #define LED1_PERIPHERAL RCC_APB2Periph_GPIOB
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
 #define BEEP_GPIO   GPIOA
 #define BEEP_PIN    Pin_12 // PA12 (Beeper)
 #define BEEP_PERIPHERAL RCC_APB2Periph_GPIOA
diff --git a/src/main/target/RMDO/target.h b/src/main/target/RMDO/target.h
index 6fbd16a36d..b17efe35eb 100644
--- a/src/main/target/RMDO/target.h
+++ b/src/main/target/RMDO/target.h
@@ -28,9 +28,6 @@
 #define BEEP_PERIPHERAL RCC_AHBPeriph_GPIOC
 #define BEEPER_INVERTED
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
 #define USABLE_TIMER_CHANNEL_COUNT 17
 
 #define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready
diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h
index 7a2ba579a0..7f85e4d736 100644
--- a/src/main/target/SPARKY/target.h
+++ b/src/main/target/SPARKY/target.h
@@ -34,9 +34,6 @@
 
 #define USABLE_TIMER_CHANNEL_COUNT 11
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
-
 // MPU6050 interrupts
 #define EXTI15_10_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 #define USE_MPU_DATA_READY_SIGNAL
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index b83f65e7e1..29c2d216bf 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -38,8 +38,6 @@
 #define USE_MAG_DATA_READY_SIGNAL
 #define ENSURE_MAG_DATA_READY_IS_HIGH
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
 #define GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index e843edd03d..e9780b1342 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -41,8 +41,6 @@
 #define USE_MAG_DATA_READY_SIGNAL
 #define ENSURE_MAG_DATA_READY_IS_HIGH
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
 #define GYRO
 //#define USE_FAKE_GYRO