diff --git a/src/main/drivers/system.c b/src/main/drivers/system.c
index 962b637349..37b870bfd8 100644
--- a/src/main/drivers/system.c
+++ b/src/main/drivers/system.c
@@ -27,25 +27,6 @@
 
 #include "system.h"
 
-#ifndef EXTI_CALLBACK_HANDLER_COUNT
-#define EXTI_CALLBACK_HANDLER_COUNT 1
-#endif
-
-extiCallbackHandlerConfig_t extiHandlerConfigs[EXTI_CALLBACK_HANDLER_COUNT];
-
-void registerExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn)
-{
-    for (int index = 0; index < EXTI_CALLBACK_HANDLER_COUNT; index++) {
-        extiCallbackHandlerConfig_t *candidate = &extiHandlerConfigs[index];
-        if (!candidate->fn) {
-            candidate->fn = fn;
-            candidate->irqn = irqn;
-            return;
-        }
-    }
-    failureMode(FAILURE_DEVELOPER); // EXTI_CALLBACK_HANDLER_COUNT is too low for the amount of handlers required.
-}
-
 // cycles per microsecond
 static uint32_t usTicks = 0;
 // current uptime for 1kHz systick timer. will rollover after 49 days. hopefully we won't care.
diff --git a/src/main/drivers/system.h b/src/main/drivers/system.h
index 105a584c44..084bab2256 100644
--- a/src/main/drivers/system.h
+++ b/src/main/drivers/system.h
@@ -48,22 +48,9 @@ void enableGPIOPowerUsageAndNoiseReductions(void);
 // current crystal frequency - 8 or 12MHz
 
 extern uint32_t hse_value;
+extern uint32_t cachedRccCsrValue;
 
 typedef void extiCallbackHandlerFunc(void);
 
-typedef struct extiCallbackHandlerConfig_s {
-    IRQn_Type irqn;
-    extiCallbackHandlerFunc* fn;
-} extiCallbackHandlerConfig_t;
-
-#ifndef EXTI_CALLBACK_HANDLER_COUNT
-#define EXTI_CALLBACK_HANDLER_COUNT 1
-#endif
-
-extern extiCallbackHandlerConfig_t extiHandlerConfigs[EXTI_CALLBACK_HANDLER_COUNT];
-
-void registerExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);
-void unregisterExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);
-
-extern uint32_t cachedRccCsrValue;
+void registerExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);void unregisterExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);
 
diff --git a/src/main/drivers/system_stm32f10x.c b/src/main/drivers/system_stm32f10x.c
index d77f9fec55..d7f0d136e5 100644
--- a/src/main/drivers/system_stm32f10x.c
+++ b/src/main/drivers/system_stm32f10x.c
@@ -17,7 +17,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 
 #include "platform.h"
 
@@ -107,7 +106,6 @@ void systemInit(void)
     // Init cycle counter
     cycleCounterInit();
 
-    memset(extiHandlerConfigs, 0x00, sizeof(extiHandlerConfigs));
     // SysTick
     SysTick_Config(SystemCoreClock / 1000);
 }
diff --git a/src/main/drivers/system_stm32f30x.c b/src/main/drivers/system_stm32f30x.c
index 507e0811c5..b62d8bb3c7 100644
--- a/src/main/drivers/system_stm32f30x.c
+++ b/src/main/drivers/system_stm32f30x.c
@@ -17,7 +17,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 
 #include "platform.h"
 
@@ -100,7 +99,6 @@ void systemInit(void)
     // Init cycle counter
     cycleCounterInit();
 
-    memset(extiHandlerConfigs, 0x00, sizeof(extiHandlerConfigs));
     // SysTick
     SysTick_Config(SystemCoreClock / 1000);
 }
diff --git a/src/main/drivers/system_stm32f4xx.c b/src/main/drivers/system_stm32f4xx.c
index 89d80c4cd3..e9b2c7e241 100644
--- a/src/main/drivers/system_stm32f4xx.c
+++ b/src/main/drivers/system_stm32f4xx.c
@@ -17,7 +17,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 
 #include "platform.h"
 
@@ -183,7 +182,6 @@ void systemInit(void)
     // Init cycle counter
     cycleCounterInit();
 
-    memset(extiHandlerConfigs, 0x00, sizeof(extiHandlerConfigs));
     // SysTick
     SysTick_Config(SystemCoreClock / 1000);
 }
diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h
index a578be44ec..27c3ea7f6d 100755
--- a/src/main/target/AIRHEROF3/target.h
+++ b/src/main/target/AIRHEROF3/target.h
@@ -30,7 +30,6 @@
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC13
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU INT
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
diff --git a/src/main/target/ALIENFLIGHTF1/target.h b/src/main/target/ALIENFLIGHTF1/target.h
index a28bbf6f96..69ac283e52 100644
--- a/src/main/target/ALIENFLIGHTF1/target.h
+++ b/src/main/target/ALIENFLIGHTF1/target.h
@@ -26,9 +26,9 @@
 #define BEEPER                  PA12
 
 #define USE_EXTI
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
-//#define DEBUG_MPU_DATA_READY_INTERRUPT
+#define MAG_INT_EXTI            PC14
 #define USE_MPU_DATA_READY_SIGNAL
+//#define DEBUG_MPU_DATA_READY_INTERRUPT
 
 #define GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index 94317e7768..590e0b7ee5 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -35,8 +35,6 @@
 
 #define BEEPER                  PA5
 
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
-
 #define USE_EXTI
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index ef01181237..a8b0638f19 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -35,7 +35,6 @@
 // MPU interrupt
 #define USE_EXTI
 #define MPU_INT_EXTI            PC14
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index b9d24c95d1..4ab4f96334 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -27,7 +27,6 @@
 #define HW_PIN                  PB2
 
 #define BOARD_HAS_VOLTAGE_DIVIDER
-#define USE_EXTI
 
 #define LED0                    PB6
 #define LED1                    PB5
@@ -41,10 +40,11 @@
 #define INVERTER_USART          USART6
 
 // MPU6500 interrupt
-//#define DEBUG_MPU_DATA_READY_INTERRUPT
+#define USE_EXTI
+#define MPU_INT_EXTI            PC5
 #define USE_MPU_DATA_READY_SIGNAL
-//#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
-#define MPU_INT_EXTI PC5
+//#define DEBUG_MPU_DATA_READY_INTERRUPT
+
 #define MPU6500_CS_PIN          PC4
 #define MPU6500_SPI_INSTANCE    SPI1
 
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index 5fbed88248..4aa6b2046c 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -17,9 +17,6 @@
 
 #pragma once
 
-#define PLL_M 16
-#define PLL_N 336
-
 #define TARGET_BOARD_IDENTIFIER "COLI"
 
 #define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)
@@ -29,96 +26,99 @@
 #define USBD_SERIALNUMBER_STRING "0x8020000"
 #endif
 
-#define LED0            PC14
-#define LED1            PC13
-#define BEEPER          PC5
-#define INVERTER        PB2 // PB2 used as inverter select GPIO
-#define INVERTER_USART  USART2
+#define PLL_M                   16
+#define PLL_N                   336
 
-#define MPU6000_CS_PIN        PC4
-#define MPU6000_SPI_INSTANCE  SPI1
+#define LED0                    PC14
+#define LED1                    PC13
+
+#define BEEPER                  PC5
+
+#define INVERTER                PB2 // PB2 used as inverter select GPIO
+#define INVERTER_USART          USART2
+
+#define MPU6000_CS_PIN          PC4
+#define MPU6000_SPI_INSTANCE    SPI1
 
 #define ACC
 #define USE_ACC_SPI_MPU6000
-#define ACC_MPU6000_ALIGN CW270_DEG_FLIP
+#define ACC_MPU6000_ALIGN       CW270_DEG_FLIP
 
 #define GYRO
 #define USE_GYRO_SPI_MPU6000
-#define GYRO_MPU6000_ALIGN CW270_DEG_FLIP
+#define GYRO_MPU6000_ALIGN      CW270_DEG_FLIP
 
 // MPU6000 interrupts
 #define USE_EXTI
-#define MPU_INT_EXTI PC0
+#define MPU_INT_EXTI            PC0
 #define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
 
 #define MAG
 #define USE_MAG_HMC5883
-#define MAG_HMC5883_ALIGN CW270_DEG_FLIP
+#define MAG_HMC5883_ALIGN       CW270_DEG_FLIP
 
+#define MAG_INT_EXTI            PC1
 #define USE_MAG_DATA_READY_SIGNAL
 #define ENSURE_MAG_DATA_READY_IS_HIGH
-#define MAG_INT_EXTI PC1
 
 #define BARO
 #define USE_BARO_MS5611
 
-#define M25P16_CS_PIN         PB12
-#define M25P16_SPI_INSTANCE   SPI2
+#define M25P16_CS_PIN           PB12
+#define M25P16_SPI_INSTANCE     SPI2
 
 #define USE_FLASHFS
 #define USE_FLASH_M25P16
 
 
 #define USE_VCP
-#define VBUS_SENSING_PIN PA9
+#define VBUS_SENSING_PIN        PA9
 
 #define USE_UART1
-#define UART1_RX_PIN PB7
-#define UART1_TX_PIN PB6
-#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
+#define UART1_RX_PIN            PB7
+#define UART1_TX_PIN            PB6
+#define UART1_AHB1_PERIPHERALS  RCC_AHB1Periph_DMA2
 
 #define USE_UART2
-#define UART2_RX_PIN PA3
-#define UART2_TX_PIN PA2
+#define UART2_RX_PIN            PA3
+#define UART2_TX_PIN            PA2
 
 #define USE_UART3
-#define UART3_RX_PIN PB11
-#define UART3_TX_PIN PB10
+#define UART3_RX_PIN            PB11
+#define UART3_TX_PIN            PB10
 
 //#define USE_UART4
 #define UART4_RX_PIN PC11
 #define UART4_TX_PIN PC10
 
 //#define USE_UART5
-#define UART5_RX_PIN PD2
-#define UART5_TX_PIN PC12
+#define UART5_RX_PIN            PD2
+#define UART5_TX_PIN            PC12
 
-#define SERIAL_PORT_COUNT 4 //VCP, UART1, UART2, UART3
+#define SERIAL_PORT_COUNT       4 //VCP, UART1, UART2, UART3
 
 #define USE_SPI
 
 #define USE_SPI_DEVICE_1
-#define SPI1_NSS_PIN    PC4
-#define SPI1_SCK_PIN    PA5
-#define SPI1_MISO_PIN   PA6
-#define SPI1_MOSI_PIN   PA7
+#define SPI1_NSS_PIN            PC4
+#define SPI1_SCK_PIN            PA5
+#define SPI1_MISO_PIN           PA6
+#define SPI1_MOSI_PIN           PA7
 
 #define USE_SPI_DEVICE_2
-#define SPI2_NSS_PIN    PB12
-#define SPI2_SCK_PIN    PB13
-#define SPI2_MISO_PIN   PC2
-#define SPI2_MOSI_PIN   PC3
+#define SPI2_NSS_PIN            PB12
+#define SPI2_SCK_PIN            PB13
+#define SPI2_MISO_PIN           PC2
+#define SPI2_MOSI_PIN           PC3
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_3)
-#define I2C3_SCL PA8
-#define I2C3_SDA PC9
+#define I2C_DEVICE              (I2CDEV_3)
+#define I2C3_SCL                PA8
+#define I2C3_SDA                PC9
 
-#define SENSORS_SET (SENSOR_ACC)
+#define SENSORS_SET             (SENSOR_ACC)
 
 #define LED_STRIP
-
 #define WS2811_PIN                      PB7 // Shared UART1
 #define WS2811_TIMER                    TIM4
 #define WS2811_TIMER_CHANNEL            TIM_Channel_2
@@ -134,15 +134,15 @@
 
 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
 
-#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
-#define DEFAULT_FEATURES   FEATURE_BLACKBOX
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
+#define DEFAULT_FEATURES        FEATURE_BLACKBOX
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
-#define TARGET_IO_PORTA    0xffff
-#define TARGET_IO_PORTB    0xffff
-#define TARGET_IO_PORTC    0xffff
-#define TARGET_IO_PORTD    0xffff
+#define TARGET_IO_PORTA         0xffff
+#define TARGET_IO_PORTB         0xffff
+#define TARGET_IO_PORTC         0xffff
+#define TARGET_IO_PORTD         0xffff
 
 #define USABLE_TIMER_CHANNEL_COUNT 16
-#define USED_TIMERS  ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(12) | TIM_N(8) | TIM_N(10) | TIM_N(11))
+#define USED_TIMERS             ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(12) | TIM_N(8) | TIM_N(10) | TIM_N(11))
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index a68d7a71d9..5e8ac5d79e 100755
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -34,7 +34,6 @@
 // MPU6500 interrupt
 #define USE_EXTI
 #define MPU_INT_EXTI            PA5
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h
index 3f40c4ab43..a5084a93e5 100644
--- a/src/main/target/DOGE/target.h
+++ b/src/main/target/DOGE/target.h
@@ -110,13 +110,11 @@
 
 // mpu_int definition in sensors/initialisation.c
 #define USE_EXTI
-#define MPU_INT_EXTI PC13
+#define MPU_INT_EXTI            PC13
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
-
 #define LED_STRIP
 
 // tqfp48 pin 16
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index d8f8154031..c366b5f23d 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -34,10 +34,9 @@
 
 
 // MPU6000 interrupts
-#define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
-#define MPU_INT_EXTI            PB0
 #define USE_EXTI
+#define MPU_INT_EXTI            PB0
+#define USE_MPU_DATA_READY_SIGNAL
 
 #define MPU6000_CS_PIN          PA4
 #define MPU6000_SPI_INSTANCE    SPI1
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index 1cc93b6f21..4ae2ceacaa 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -29,7 +29,6 @@
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PA3
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU INT, SDCardDetect
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index 2ccc49f739..74de219de1 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -34,7 +34,6 @@
 // MPU6000 interrupts
 #define USE_EXTI
 #define MPU_INT_EXTI            PC4
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready (mag disabled)
 #define USE_MPU_DATA_READY_SIGNAL
 
 #define MPU6000_CS_PIN          PA4
diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h
index b629d48df1..f3f2ee8119 100644
--- a/src/main/target/IRCFUSIONF3/target.h
+++ b/src/main/target/IRCFUSIONF3/target.h
@@ -24,10 +24,7 @@
 #define LED0                    PB3
 
 #define USE_EXTI
-#define MPU_INT_EXTI PC13
-
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready, no MAG
-
+#define MPU_INT_EXTI            PC13
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index b0a2bf7520..c92c3e97e3 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -32,7 +32,6 @@
 // MPU6500 interrupt
 #define USE_EXTI
 #define MPU_INT_EXTI            PA5
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index 1d9c3fa70e..740fb2fd32 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -32,7 +32,6 @@
 
 #define USE_EXTI
 #define MAG_INT_EXTI            PC14
-#define EXTI_CALLBACK_HANDLER_COUNT 3 // MPU data ready, MAG data ready, BMP085 EOC
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
 //#define DEBUG_MAG_DATA_READY_INTERRUPT
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index b69f8e9129..4caeaf33f4 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -37,8 +37,7 @@
 #define INVERTER_USART          USART2
 
 #define USE_EXTI
-#define MAG_INT_EXTI PC14
-#define EXTI_CALLBACK_HANDLER_COUNT 3 // MPU data ready, MAG data ready, BMP085 EOC
+#define MAG_INT_EXTI            PC14
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
 //#define DEBUG_MAG_DATA_READY_INTERRUPT
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 5434391b3e..2550b27fb4 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -29,7 +29,6 @@
 #define USE_EXTI
 #define MPU_INT_EXTI PC13
 #define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
 #define EXTI15_10_CALLBACK_HANDLER_COUNT 2 // MPU_INT, SDCardDetect
 
 #define MPU6000_SPI_INSTANCE    SPI1
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 4bd45103a3..376a683c77 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -49,11 +49,10 @@
 #define USE_EXTI
 #define MPU_INT_EXTI            PC4
 #define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
 
 #define MAG
 #define USE_MAG_HMC5883
-#define MAG_HMC5883_ALIGN CW90_DEG
+#define MAG_HMC5883_ALIGN       CW90_DEG
 
 //#define USE_MAG_NAZA
 //#define MAG_NAZA_ALIGN CW180_DEG_FLIP
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index b697c887f3..57ad576597 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -47,7 +47,6 @@
 #define USE_EXTI
 #define MPU_INT_EXTI            PC4
 #define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
 
 #define MAG
 #define USE_MAG_HMC5883
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index 3a4f8d157a..fa38860682 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -57,7 +57,6 @@
 #define MPU_INT_EXTI            PA15
 #define USE_MPU_DATA_READY_SIGNAL
 //#define ENSURE_MPU_DATA_READY_IS_LOW
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready (mag disabled)
 
 #define USE_VCP
 #define VBUS_SENSING_PIN        PA9
diff --git a/src/main/target/RMDO/target.h b/src/main/target/RMDO/target.h
index 57155d209b..1b94d82f24 100644
--- a/src/main/target/RMDO/target.h
+++ b/src/main/target/RMDO/target.h
@@ -28,7 +28,6 @@
 
 #define USE_EXTI
 #define MPU_INT_EXTI PC13
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 //#define USE_MAG_DATA_READY_SIGNAL       // XXX Do RMDO has onboard mag???
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index 1b9a66974a..9ef673ff5c 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -39,7 +39,6 @@
 // MPU9250 interrupt
 #define USE_EXTI
 #define MPU_INT_EXTI            PC5
-#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index 4b2ac2e943..543a91d20b 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -27,8 +27,7 @@
 #define BEEPER_INVERTED
 
 #define USE_EXTI
-#define MPU_INT_EXTI PC13
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready
+#define MPU_INT_EXTI            PC13
 #define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h
index cda9b14463..def63803d7 100644
--- a/src/main/target/VRRACE/target.h
+++ b/src/main/target/VRRACE/target.h
@@ -42,10 +42,9 @@
 #define GYRO_MPU6500_ALIGN CW270_DEG
 
 // MPU6500 interrupts
-#define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
-#define MPU_INT_EXTI PD10
 #define USE_EXTI
+#define MPU_INT_EXTI PD10
+#define USE_MPU_DATA_READY_SIGNAL
 
 /*
 #define BARO
diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h
index 9cc822ebee..d8e8f1b179 100644
--- a/src/main/target/X_RACERSPI/target.h
+++ b/src/main/target/X_RACERSPI/target.h
@@ -42,10 +42,9 @@
 #define ACC_MPU6000_ALIGN       CW270_DEG
 
 // MPU6000 interrupts
-#define USE_MPU_DATA_READY_SIGNAL
-#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
-#define MPU_INT_EXTI                PC13
 #define USE_EXTI
+#define MPU_INT_EXTI            PC13
+#define USE_MPU_DATA_READY_SIGNAL
 
 
 #define USE_FLASHFS