diff --git a/src/main/platform.h b/src/main/platform.h
index b3ead5a6cd..458146c9b2 100644
--- a/src/main/platform.h
+++ b/src/main/platform.h
@@ -22,7 +22,6 @@
 #include "stm32f4xx_rcc.h"
 #include "stm32f4xx_gpio.h"
 #include "core_cm4.h"
-#include "target/common_stm32f4xx.h"
 
 // Chip Unique ID on F405
 #define U_ID_0 (*(uint32_t*)0x1fff7a10)
diff --git a/src/main/scheduler.c b/src/main/scheduler.c
index 7e480cc2f8..7e7b98469b 100755
--- a/src/main/scheduler.c
+++ b/src/main/scheduler.c
@@ -31,10 +31,6 @@
 
 #include "drivers/system.h"
 
-#ifndef SCHEDULER_DELAY_LIMIT
-#define SCHEDULER_DELAY_LIMIT 100
-#endif
-
 static cfTask_t *currentTask = NULL;
 
 static uint32_t totalWaitingTasks;
diff --git a/src/main/scheduler_tasks.c b/src/main/scheduler_tasks.c
index 87435f519b..c2b949259a 100644
--- a/src/main/scheduler_tasks.c
+++ b/src/main/scheduler_tasks.c
@@ -45,10 +45,6 @@ void taskBstReadWrite(void);
 void taskBstMasterProcess(void);
 #endif
 
-#ifndef TASK_GYROPID_DESIRED_PERIOD
-#define TASK_GYROPID_DESIRED_PERIOD 1000
-#endif
-
 cfTask_t cfTasks[TASK_COUNT] = {
     [TASK_SYSTEM] = {
         .taskName = "SYSTEM",
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 75d8cea8c9..eab30f68d5 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -20,9 +20,6 @@
 #define TARGET_BOARD_IDENTIFIER "AFNA" // AFroNAze - NAZE might be considered misleading on Naze clones like the flip32.
 #define USE_HARDWARE_REVISION_DETECTION
 
-/* remove some options from common.h due to flash size */
-#undef GPS
-
 #define BOARD_HAS_VOLTAGE_DIVIDER
 
 #define LED0    PB3 // PB3 (LED)
diff --git a/src/main/target/common.h b/src/main/target/common.h
index 5f5b998820..9fd90daa5d 100644
--- a/src/main/target/common.h
+++ b/src/main/target/common.h
@@ -17,30 +17,10 @@
  
 #pragma once
 
-#define USE_SERVOS
-#define USE_CLI
-#define SERIAL_RX
-#define BLACKBOX
-
-#if (FLASH_SIZE > 64)
-#define GPS
-#define GPS_PROTO_NMEA
-#define GPS_PROTO_UBLOX
-#define GPS_PROTO_I2C_NAV
-#define GPS_PROTO_NAZA
-
-#define TELEMETRY
-#define TELEMETRY_FRSKY
-#define TELEMETRY_HOTT
-#define TELEMETRY_SMARTPORT
-#define TELEMETRY_LTM
-#endif
-
-#if (FLASH_SIZE > 128)
-#define DISPLAY
-#define DISPLAY_ARMED_BITMAP
+#ifdef STM32F4
+#define TASK_GYROPID_DESIRED_PERIOD 125
+#define SCHEDULER_DELAY_LIMIT 10
 #else
-#define SKIP_CLI_COMMAND_HELP
-#define SKIP_RX_MSP
-#define DISABLE_UNCOMMON_MIXERS
-#endif
+#define TASK_GYROPID_DESIRED_PERIOD 1000
+#define SCHEDULER_DELAY_LIMIT 100
+#endif
\ No newline at end of file
diff --git a/src/main/target/common_stm32f4xx.h b/src/main/target/common_stm32f4xx.h
deleted file mode 100644
index 14867e33b8..0000000000
--- a/src/main/target/common_stm32f4xx.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-	Common defines applicable to STM32F4
-*/
-
-#define TASK_GYROPID_DESIRED_PERIOD 125
\ No newline at end of file