diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index cf2be210ae..517f160a72 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -4804,14 +4804,12 @@ static void cliStatus(const char *cmdName, char *cmdline)
         }
     }
 #ifdef USE_SPI
-#ifdef USE_GYRO_EXTI
     if (gyroActiveDev()->gyroModeSPI != GYRO_EXTI_NO_INT) {
         cliPrintf(" locked");
     }
     if (gyroActiveDev()->gyroModeSPI == GYRO_EXTI_INT_DMA) {
         cliPrintf(" dma");
     }
-#endif
     if (spiGetExtDeviceCount(&gyroActiveDev()->dev) > 1) {
         cliPrintf(" shared");
     }
@@ -5201,9 +5199,7 @@ const cliResourceValue_t resourceTable[] = {
     DEFS( OWNER_RX_SPI_EXPRESSLRS_BUSY, PG_RX_EXPRESSLRS_SPI_CONFIG, rxExpressLrsSpiConfig_t, busyIoTag ),
 #endif
 #endif
-#ifdef USE_GYRO_EXTI
     DEFW( OWNER_GYRO_EXTI,     PG_GYRO_DEVICE_CONFIG, gyroDeviceConfig_t, extiTag, MAX_GYRODEV_COUNT ),
-#endif
     DEFW( OWNER_GYRO_CS,       PG_GYRO_DEVICE_CONFIG, gyroDeviceConfig_t, csnTag, MAX_GYRODEV_COUNT ),
 #ifdef USE_USB_DETECT
     DEFS( OWNER_USB_DETECT,    PG_USB_CONFIG, usbDev_t, detectPin ),
diff --git a/src/main/drivers/accgyro/accgyro.h b/src/main/drivers/accgyro/accgyro.h
index 29ba307ac5..4a9673311e 100644
--- a/src/main/drivers/accgyro/accgyro.h
+++ b/src/main/drivers/accgyro/accgyro.h
@@ -109,14 +109,12 @@ typedef struct gyroDev_s {
     sensor_align_e gyroAlign;
     gyroRateKHz_e gyroRateKHz;
     gyroModeSPI_e gyroModeSPI;
-#ifdef USE_GYRO_EXTI
     uint32_t detectedEXTI;
     uint32_t gyroLastEXTI;
     uint32_t gyroSyncEXTI;
     int32_t gyroShortPeriod;
     int32_t gyroDmaMaxDuration;
     busSegment_t segments[2];
-#endif
     volatile bool dataReady;
     bool gyro_high_fsr;
     uint8_t hardware_lpf;
diff --git a/src/main/drivers/accgyro/accgyro_mpu.c b/src/main/drivers/accgyro/accgyro_mpu.c
index 0a0a73c403..08cf4dc707 100644
--- a/src/main/drivers/accgyro/accgyro_mpu.c
+++ b/src/main/drivers/accgyro/accgyro_mpu.c
@@ -115,7 +115,6 @@ static void mpu6050FindRevision(gyroDev_t *gyro)
 /*
  * Gyro interrupt service routine
  */
-#ifdef USE_GYRO_EXTI
 #ifdef USE_SPI_GYRO
 // Called in ISR context
 // Gyro read has just completed
@@ -181,7 +180,6 @@ static void mpuIntExtiInit(gyroDev_t *gyro)
     EXTIConfig(mpuIntIO, &gyro->exti, NVIC_PRIO_MPU_INT_EXTI, IOCFG_IN_FLOATING, BETAFLIGHT_EXTI_TRIGGER_RISING);
     EXTIEnable(mpuIntIO);
 }
-#endif // USE_GYRO_EXTI
 
 bool mpuAccRead(accDev_t *acc)
 {
@@ -270,7 +268,7 @@ bool mpuGyroReadSPI(gyroDev_t *gyro)
     {
         // Initialise the tx buffer to all 0xff
         memset(gyro->dev.txBuf, 0xff, 16);
-#ifdef USE_GYRO_EXTI
+
         // Check that minimum number of interrupts have been detected
 
         // We need some offset from the gyro interrupts to ensure sampling after the interrupt
@@ -289,9 +287,7 @@ bool mpuGyroReadSPI(gyroDev_t *gyro)
                 // Interrupts are present, but no DMA
                 gyro->gyroModeSPI = GYRO_EXTI_INT;
             }
-        } else
-#endif
-        {
+        } else {
             gyro->gyroModeSPI = GYRO_EXTI_NO_INT;
         }
         break;
@@ -489,11 +485,7 @@ void mpuGyroInit(gyroDev_t *gyro)
 {
     gyro->accDataReg = MPU_RA_ACCEL_XOUT_H;
     gyro->gyroDataReg = MPU_RA_GYRO_XOUT_H;
-#ifdef USE_GYRO_EXTI
     mpuIntExtiInit(gyro);
-#else
-    UNUSED(gyro);
-#endif
 }
 
 uint8_t mpuGyroDLPF(gyroDev_t *gyro)
diff --git a/src/main/drivers/accgyro/accgyro_mpu6050.c b/src/main/drivers/accgyro/accgyro_mpu6050.c
index e01c6f0a69..5ea61fbff3 100644
--- a/src/main/drivers/accgyro/accgyro_mpu6050.c
+++ b/src/main/drivers/accgyro/accgyro_mpu6050.c
@@ -96,9 +96,7 @@ static void mpu6050GyroInit(gyroDev_t *gyro)
     busWriteRegister(dev, MPU_RA_INT_PIN_CFG,
             0 << 7 | 0 << 6 | 0 << 5 | 0 << 4 | 0 << 3 | 0 << 2 | 1 << 1 | 0 << 0); // INT_PIN_CFG   -- INT_LEVEL_HIGH, INT_OPEN_DIS, LATCH_INT_DIS, INT_RD_CLEAR_DIS, FSYNC_INT_LEVEL_HIGH, FSYNC_INT_DIS, I2C_BYPASS_EN, CLOCK_DIS
 
-#ifdef USE_MPU_DATA_READY_SIGNAL
-    busWriteRegister(dev, MPU_RA_INT_ENABLE, MPU_RF_DATA_RDY_EN);
-#endif
+    busWriteRegister(&gyro->dev, MPU_RA_INT_ENABLE, MPU_RF_DATA_RDY_EN);
 }
 
 bool mpu6050GyroDetect(gyroDev_t *gyro)
diff --git a/src/main/drivers/accgyro/accgyro_mpu6500.c b/src/main/drivers/accgyro/accgyro_mpu6500.c
index 70d59168f2..e4a0c86dfc 100644
--- a/src/main/drivers/accgyro/accgyro_mpu6500.c
+++ b/src/main/drivers/accgyro/accgyro_mpu6500.c
@@ -91,9 +91,7 @@ void mpu6500GyroInit(gyroDev_t *gyro)
 #endif
     delay(15);
 
-#ifdef USE_MPU_DATA_READY_SIGNAL
-    busWriteRegister(dev, MPU_RA_INT_ENABLE, MPU6500_BIT_RAW_RDY_EN); // RAW_RDY_EN interrupt enable
-#endif
+    busWriteRegister(&gyro->dev, MPU_RA_INT_ENABLE, MPU6500_BIT_RAW_RDY_EN); // RAW_RDY_EN interrupt enable
     delay(15);
 }
 
diff --git a/src/main/drivers/accgyro/accgyro_spi_bmi160.c b/src/main/drivers/accgyro/accgyro_spi_bmi160.c
index fac54effd8..ed08c0353b 100644
--- a/src/main/drivers/accgyro/accgyro_spi_bmi160.c
+++ b/src/main/drivers/accgyro/accgyro_spi_bmi160.c
@@ -120,8 +120,6 @@ uint8_t bmi160Detect(const extDevice_t *dev)
 
     BMI160Detected = true;
 
-    spiSetClkDivisor(dev, spiCalculateDivider(BMI160_MAX_SPI_CLK_HZ));
-
     return BMI_160_SPI;
 }
 
@@ -260,7 +258,6 @@ static int32_t BMI160_do_foc(const extDevice_t *dev)
 
 extiCallbackRec_t bmi160IntCallbackRec;
 
-#ifdef USE_GYRO_EXTI
 // Called in ISR context
 // Gyro read has just completed
 busStatus_e bmi160Intcallback(uint32_t arg)
@@ -280,6 +277,8 @@ busStatus_e bmi160Intcallback(uint32_t arg)
 void bmi160ExtiHandler(extiCallbackRec_t *cb)
 {
     gyroDev_t *gyro = container_of(cb, gyroDev_t, exti);
+    extDevice_t *dev = &gyro->dev;
+
     // Ideally we'd use a timer to capture such information, but unfortunately the port used for EXTI interrupt does
     // not have an associated timer
     uint32_t nowCycles = getCycleCounter();
@@ -287,7 +286,7 @@ void bmi160ExtiHandler(extiCallbackRec_t *cb)
     gyro->gyroLastEXTI = nowCycles;
 
     if (gyro->gyroModeSPI == GYRO_EXTI_INT_DMA) {
-        spiSequence(&gyro->dev, gyro->segments);
+        spiSequence(dev, gyro->segments);
     }
 
     gyro->detectedEXTI++;
@@ -307,35 +306,29 @@ static void bmi160IntExtiInit(gyroDev_t *gyro)
     EXTIConfig(mpuIntIO, &gyro->exti, NVIC_PRIO_MPU_INT_EXTI, IOCFG_IN_FLOATING, BETAFLIGHT_EXTI_TRIGGER_RISING);
     EXTIEnable(mpuIntIO);
 }
-#else
-void bmi160ExtiHandler(extiCallbackRec_t *cb)
-{
-    gyroDev_t *gyro = container_of(cb, gyroDev_t, exti);
-    gyro->dataReady = true;
-}
-#endif
 
 static bool bmi160AccRead(accDev_t *acc)
 {
+    extDevice_t *dev = &acc->gyro->dev;
     switch (acc->gyro->gyroModeSPI) {
     case GYRO_EXTI_INT:
     case GYRO_EXTI_NO_INT:
     {
-        acc->gyro->dev.txBuf[0] = BMI160_REG_ACC_DATA_X_LSB | 0x80;
+        dev->txBuf[0] = BMI160_REG_ACC_DATA_X_LSB | 0x80;
 
         busSegment_t segments[] = {
                 {.u.buffers = {NULL, NULL}, 7, true, NULL},
                 {.u.link = {NULL, NULL}, 0, true, NULL},
         };
-        segments[0].u.buffers.txData = &acc->gyro->dev.txBuf[1];
-        segments[0].u.buffers.rxData = &acc->gyro->dev.rxBuf[1];
+        segments[0].u.buffers.txData = &dev->txBuf[1];
+        segments[0].u.buffers.rxData = &dev->rxBuf[1];
 
         spiSequence(&acc->gyro->dev, &segments[0]);
 
         // Wait for completion
         spiWait(&acc->gyro->dev);
 
-        uint16_t *accData = (uint16_t *)acc->gyro->dev.rxBuf;
+        uint16_t *accData = (uint16_t *)dev->rxBuf;
         acc->ADCRaw[X] = accData[1];
         acc->ADCRaw[Y] = accData[2];
         acc->ADCRaw[Z] = accData[3];
@@ -348,7 +341,7 @@ static bool bmi160AccRead(accDev_t *acc)
         // up an old value.
 
         // This data was read from the gyro, which is the same SPI device as the acc
-        uint16_t *accData = (uint16_t *)acc->gyro->dev.rxBuf;
+        uint16_t *accData = (uint16_t *)dev->rxBuf;
         acc->ADCRaw[X] = accData[4];
         acc->ADCRaw[Y] = accData[5];
         acc->ADCRaw[Z] = accData[6];
@@ -366,35 +359,33 @@ static bool bmi160AccRead(accDev_t *acc)
 
 static bool bmi160GyroRead(gyroDev_t *gyro)
 {
-    uint16_t *gyroData = (uint16_t *)gyro->dev.rxBuf;
+    extDevice_t *dev = &gyro->dev;
+    uint16_t *gyroData = (uint16_t *)dev->rxBuf;
     switch (gyro->gyroModeSPI) {
     case GYRO_EXTI_INIT:
     {
         // Initialise the tx buffer to all 0x00
-        memset(gyro->dev.txBuf, 0x00, 14);
-#ifdef USE_GYRO_EXTI
+        memset(dev->txBuf, 0x00, 14);
         // Check that minimum number of interrupts have been detected
 
         // We need some offset from the gyro interrupts to ensure sampling after the interrupt
         gyro->gyroDmaMaxDuration = 5;
         // Using DMA for gyro access upsets the scheduler on the F4
         if (gyro->detectedEXTI > GYRO_EXTI_DETECT_THRESHOLD) {
-            if (spiUseDMA(&gyro->dev)) {
-                gyro->dev.callbackArg = (uint32_t)gyro;
-                gyro->dev.txBuf[1] = BMI160_REG_GYR_DATA_X_LSB | 0x80;
+            if (spiUseDMA(dev)) {
+                dev->callbackArg = (uint32_t)gyro;
+                dev->txBuf[1] = BMI160_REG_GYR_DATA_X_LSB | 0x80;
                 gyro->segments[0].len = 14;
                 gyro->segments[0].callback = bmi160Intcallback;
-                gyro->segments[0].u.buffers.txData = &gyro->dev.txBuf[1];
-                gyro->segments[0].u.buffers.rxData = &gyro->dev.rxBuf[1];
+                gyro->segments[0].u.buffers.txData = dev.txBuf[1];
+                gyro->segments[0].u.buffers.rxData = dev.rxBuf[1];
                 gyro->segments[0].negateCS = true;
                 gyro->gyroModeSPI = GYRO_EXTI_INT_DMA;
             } else {
                 // Interrupts are present, but no DMA
                 gyro->gyroModeSPI = GYRO_EXTI_INT;
             }
-        } else
-#endif
-        {
+        } else {
             gyro->gyroModeSPI = GYRO_EXTI_NO_INT;
         }
         break;
@@ -403,19 +394,19 @@ static bool bmi160GyroRead(gyroDev_t *gyro)
     case GYRO_EXTI_INT:
     case GYRO_EXTI_NO_INT:
     {
-        gyro->dev.txBuf[1] = BMI160_REG_GYR_DATA_X_LSB | 0x80;
+        dev->txBuf[1] = BMI160_REG_GYR_DATA_X_LSB | 0x80;
 
         busSegment_t segments[] = {
                 {.u.buffers = {NULL, NULL}, 7, true, NULL},
                 {.u.link = {NULL, NULL}, 0, true, NULL},
         };
-        segments[0].u.buffers.txData = &gyro->dev.txBuf[1];
-        segments[0].u.buffers.rxData = &gyro->dev.rxBuf[1];
+        segments[0].u.buffers.txData = dev.txBuf[1];
+        segments[0].u.buffers.rxData = dev.rxBuf[1];
 
-        spiSequence(&gyro->dev, &segments[0]);
+        spiSequence(dev, &segments[0]);
 
         // Wait for completion
-        spiWait(&gyro->dev);
+        spiWait(dev);
 
         // Fall through
         FALLTHROUGH;
@@ -441,10 +432,10 @@ static bool bmi160GyroRead(gyroDev_t *gyro)
 
 void bmi160SpiGyroInit(gyroDev_t *gyro)
 {
-    BMI160_Init(&gyro->dev);
-#if defined(USE_GYRO_EXTI)
+    extDevice_t *dev = &gyro->dev;
+
+    BMI160_Init(dev);
     bmi160IntExtiInit(gyro);
-#endif
 
     spiSetClkDivisor(dev, spiCalculateDivider(BMI160_MAX_SPI_CLK_HZ));
 }
diff --git a/src/main/drivers/accgyro/accgyro_spi_bmi270.c b/src/main/drivers/accgyro/accgyro_spi_bmi270.c
index 66650585ee..7243e189b3 100644
--- a/src/main/drivers/accgyro/accgyro_spi_bmi270.c
+++ b/src/main/drivers/accgyro/accgyro_spi_bmi270.c
@@ -273,7 +273,6 @@ extiCallbackRec_t bmi270IntCallbackRec;
 /*
  * Gyro interrupt service routine
  */
-#ifdef USE_GYRO_EXTI
 // Called in ISR context
 // Gyro read has just completed
 busStatus_e bmi270Intcallback(uint32_t arg)
@@ -293,6 +292,8 @@ busStatus_e bmi270Intcallback(uint32_t arg)
 void bmi270ExtiHandler(extiCallbackRec_t *cb)
 {
     gyroDev_t *gyro = container_of(cb, gyroDev_t, exti);
+    extDevice_t *dev = &gyro->dev;
+
     // Ideally we'd use a timer to capture such information, but unfortunately the port used for EXTI interrupt does
     // not have an associated timer
     uint32_t nowCycles = getCycleCounter();
@@ -300,7 +301,7 @@ void bmi270ExtiHandler(extiCallbackRec_t *cb)
     gyro->gyroLastEXTI = nowCycles;
 
     if (gyro->gyroModeSPI == GYRO_EXTI_INT_DMA) {
-        spiSequence(&gyro->dev, gyro->segments);
+        spiSequence(dev, gyro->segments);
     }
 
     gyro->detectedEXTI++;
@@ -320,28 +321,23 @@ static void bmi270IntExtiInit(gyroDev_t *gyro)
     EXTIConfig(mpuIntIO, &gyro->exti, NVIC_PRIO_MPU_INT_EXTI, IOCFG_IN_FLOATING, BETAFLIGHT_EXTI_TRIGGER_RISING);
     EXTIEnable(mpuIntIO);
 }
-#else
-void bmi270ExtiHandler(extiCallbackRec_t *cb)
-{
-    gyroDev_t *gyro = container_of(cb, gyroDev_t, exti);
-    gyro->dataReady = true;
-}
-#endif
 
 static bool bmi270AccRead(accDev_t *acc)
 {
+    extDevice_t *dev = &acc->gyro->dev;
+
     switch (acc->gyro->gyroModeSPI) {
     case GYRO_EXTI_INT:
     case GYRO_EXTI_NO_INT:
     {
-        acc->gyro->dev.txBuf[0] = BMI270_REG_ACC_DATA_X_LSB | 0x80;
+        dev->txBuf[0] = BMI270_REG_ACC_DATA_X_LSB | 0x80;
 
         busSegment_t segments[] = {
                 {.u.buffers = {NULL, NULL}, 8, true, NULL},
                 {.u.link = {NULL, NULL}, 0, true, NULL},
         };
-        segments[0].u.buffers.txData = acc->gyro->dev.txBuf;
-        segments[0].u.buffers.rxData = acc->gyro->dev.rxBuf;
+        segments[0].u.buffers.txData = dev->txBuf;
+        segments[0].u.buffers.rxData = dev->rxBuf;
 
         spiSequence(&acc->gyro->dev, &segments[0]);
 
@@ -358,7 +354,7 @@ static bool bmi270AccRead(accDev_t *acc)
         // up an old value.
 
         // This data was read from the gyro, which is the same SPI device as the acc
-        uint16_t *accData = (uint16_t *)acc->gyro->dev.rxBuf;
+        uint16_t *accData = (uint16_t *)dev->rxBuf;
         acc->ADCRaw[X] = accData[1];
         acc->ADCRaw[Y] = accData[2];
         acc->ADCRaw[Z] = accData[3];
@@ -375,35 +371,35 @@ static bool bmi270AccRead(accDev_t *acc)
 
 static bool bmi270GyroReadRegister(gyroDev_t *gyro)
 {
-    uint16_t *gyroData = (uint16_t *)gyro->dev.rxBuf;
+    extDevice_t *dev = &gyro->dev;
+    uint16_t *gyroData = (uint16_t *)dev->rxBuf;
+
     switch (gyro->gyroModeSPI) {
     case GYRO_EXTI_INIT:
     {
         // Initialise the tx buffer to all 0x00
-        memset(gyro->dev.txBuf, 0x00, 14);
-#ifdef USE_GYRO_EXTI
+        memset(dev->txBuf, 0x00, 14);
+
         // Check that minimum number of interrupts have been detected
 
         // We need some offset from the gyro interrupts to ensure sampling after the interrupt
         gyro->gyroDmaMaxDuration = 5;
         // Using DMA for gyro access upsets the scheduler on the F4
         if (gyro->detectedEXTI > GYRO_EXTI_DETECT_THRESHOLD) {
-            if (spiUseDMA(&gyro->dev)) {
-                gyro->dev.callbackArg = (uint32_t)gyro;
-                gyro->dev.txBuf[0] = BMI270_REG_ACC_DATA_X_LSB | 0x80;
+            if (spiUseDMA(dev)) {
+                dev->callbackArg = (uint32_t)gyro;
+                dev->txBuf[0] = BMI270_REG_ACC_DATA_X_LSB | 0x80;
                 gyro->segments[0].len = 14;
                 gyro->segments[0].callback = bmi270Intcallback;
-                gyro->segments[0].u.buffers.txData = gyro->dev.txBuf;
-                gyro->segments[0].u.buffers.rxData = gyro->dev.rxBuf;
+                gyro->segments[0].u.buffers.txData = dev->txBuf;
+                gyro->segments[0].u.buffers.rxData = dev->rxBuf;
                 gyro->segments[0].negateCS = true;
                 gyro->gyroModeSPI = GYRO_EXTI_INT_DMA;
             } else {
                 // Interrupts are present, but no DMA
                 gyro->gyroModeSPI = GYRO_EXTI_INT;
             }
-        } else
-#endif
-        {
+        } else {
             gyro->gyroModeSPI = GYRO_EXTI_NO_INT;
         }
         break;
@@ -412,19 +408,19 @@ static bool bmi270GyroReadRegister(gyroDev_t *gyro)
     case GYRO_EXTI_INT:
     case GYRO_EXTI_NO_INT:
     {
-        gyro->dev.txBuf[0] = BMI270_REG_GYR_DATA_X_LSB | 0x80;
+        dev->txBuf[0] = BMI270_REG_GYR_DATA_X_LSB | 0x80;
 
         busSegment_t segments[] = {
                 {.u.buffers = {NULL, NULL}, 8, true, NULL},
                 {.u.link = {NULL, NULL}, 0, true, NULL},
         };
-        segments[0].u.buffers.txData = gyro->dev.txBuf;
-        segments[0].u.buffers.rxData = gyro->dev.rxBuf;
+        segments[0].u.buffers.txData = dev->txBuf;
+        segments[0].u.buffers.rxData = dev->rxBuf;
 
-        spiSequence(&gyro->dev, &segments[0]);
+        spiSequence(dev, &segments[0]);
 
         // Wait for completion
-        spiWait(&gyro->dev);
+        spiWait(dev);
 
         gyro->gyroADCRaw[X] = gyroData[1];
         gyro->gyroADCRaw[Y] = gyroData[2];
@@ -533,9 +529,7 @@ static void bmi270SpiGyroInit(gyroDev_t *gyro)
 
     bmi270Config(gyro);
 
-#if defined(USE_GYRO_EXTI)
     bmi270IntExtiInit(gyro);
-#endif
 
     spiSetClkDivisor(dev, spiCalculateDivider(BMI270_MAX_SPI_CLK_HZ));
 }
diff --git a/src/main/drivers/accgyro/accgyro_spi_icm20649.c b/src/main/drivers/accgyro/accgyro_spi_icm20649.c
index 367ca5ca84..c9a55bca05 100644
--- a/src/main/drivers/accgyro/accgyro_spi_icm20649.c
+++ b/src/main/drivers/accgyro/accgyro_spi_icm20649.c
@@ -77,8 +77,6 @@ void icm20649AccInit(accDev_t *acc)
     // 1,024 LSB/g 30g
     acc->acc_1G = acc->acc_high_fsr ? 1024 : 2048;
 
-    spiSetClkDivisor(&acc->dev, spiCalculateDivider(ICM20649_MAX_SPI_CLK_HZ));
-
     spiWriteReg(&acc->dev, ICM20649_RA_REG_BANK_SEL, 2 << 4); // config in bank 2
     delay(15);
     const uint8_t acc_fsr = acc->acc_high_fsr ? ICM20649_FSR_30G : ICM20649_FSR_16G;
@@ -136,9 +134,7 @@ void icm20649GyroInit(gyroDev_t *gyro)
     spiWriteReg(&gyro->bus, ICM20649_RA_INT_PIN_CFG, 0x11);  // INT_ANYRD_2CLEAR, BYPASS_EN
     delay(15);
 
-#ifdef USE_MPU_DATA_READY_SIGNAL
     spiWriteReg(&gyro->bus, ICM20649_RA_INT_ENABLE_1, 0x01);
-#endif
 }
 
 bool icm20649SpiGyroDetect(gyroDev_t *gyro)
diff --git a/src/main/drivers/accgyro/accgyro_spi_icm20689.c b/src/main/drivers/accgyro/accgyro_spi_icm20689.c
index 78b2709ecf..ada4dadf78 100644
--- a/src/main/drivers/accgyro/accgyro_spi_icm20689.c
+++ b/src/main/drivers/accgyro/accgyro_spi_icm20689.c
@@ -147,25 +147,25 @@ bool icm20689SpiAccDetect(accDev_t *acc)
 
 void icm20689GyroInit(gyroDev_t *gyro)
 {
-    spiSetClkDivisor(&gyro->dev, spiCalculateDivider(ICM20689_MAX_SPI_CLK_HZ));
+    extDevice_t *dev = &gyro->dev;
+
+    spiSetClkDivisor(dev, spiCalculateDivider(ICM20689_MAX_SPI_CLK_HZ));
 
     mpuGyroInit(gyro);
 
     // Device was already reset during detection so proceed with configuration
 
-    spiWriteReg(&gyro->dev, MPU_RA_PWR_MGMT_1, INV_CLK_PLL);
+    spiWriteReg(dev, MPU_RA_PWR_MGMT_1, INV_CLK_PLL);
     delayMicroseconds(ICM20689_CLKSEL_SETTLE_US);
-    spiWriteReg(&gyro->dev, MPU_RA_GYRO_CONFIG, INV_FSR_2000DPS << 3);
-    spiWriteReg(&gyro->dev, MPU_RA_ACCEL_CONFIG, INV_FSR_16G << 3);
-    spiWriteReg(&gyro->dev, MPU_RA_CONFIG, mpuGyroDLPF(gyro));
-    spiWriteReg(&gyro->dev, MPU_RA_SMPLRT_DIV, gyro->mpuDividerDrops);
+    spiWriteReg(dev, MPU_RA_GYRO_CONFIG, INV_FSR_2000DPS << 3);
+    spiWriteReg(dev, MPU_RA_ACCEL_CONFIG, INV_FSR_16G << 3);
+    spiWriteReg(dev, MPU_RA_CONFIG, mpuGyroDLPF(gyro));
+    spiWriteReg(dev, MPU_RA_SMPLRT_DIV, gyro->mpuDividerDrops);
 
     // Data ready interrupt configuration
-    spiWriteReg(&gyro->dev, MPU_RA_INT_PIN_CFG, ICM20689_INT_ANYRD_2CLEAR);
+    spiWriteReg(dev, MPU_RA_INT_PIN_CFG, ICM20689_INT_ANYRD_2CLEAR);
 
-#ifdef USE_MPU_DATA_READY_SIGNAL
-    spiWriteReg(&gyro->dev, MPU_RA_INT_ENABLE, MPU_RF_DATA_RDY_EN);
-#endif
+    spiWriteReg(dev, MPU_RA_INT_ENABLE, MPU_RF_DATA_RDY_EN);
 }
 
 bool icm20689SpiGyroDetect(gyroDev_t *gyro)
diff --git a/src/main/drivers/accgyro/accgyro_spi_icm426xx.c b/src/main/drivers/accgyro/accgyro_spi_icm426xx.c
index 779d855d0c..8128aa943d 100644
--- a/src/main/drivers/accgyro/accgyro_spi_icm426xx.c
+++ b/src/main/drivers/accgyro/accgyro_spi_icm426xx.c
@@ -160,6 +160,7 @@ static odrEntry_t icm426xxPkhzToSupportedODRMap[] = {
 void icm426xxGyroInit(gyroDev_t *gyro)
 {
     const extDevice_t *dev = &gyro->dev;
+
     spiSetClkDivisor(dev, spiCalculateDivider(ICM426XX_MAX_SPI_CLK_HZ));
 
     mpuGyroInit(gyro);
@@ -202,7 +203,6 @@ void icm426xxGyroInit(gyroDev_t *gyro)
     spiWriteReg(dev, ICM426XX_RA_INT_CONFIG, ICM426XX_INT1_MODE_PULSED | ICM426XX_INT1_DRIVE_CIRCUIT_PP | ICM426XX_INT1_POLARITY_ACTIVE_HIGH);
     spiWriteReg(dev, ICM426XX_RA_INT_CONFIG0, ICM426XX_UI_DRDY_INT_CLEAR_ON_SBR);
 
-#ifdef USE_MPU_DATA_READY_SIGNAL
     spiWriteReg(dev, ICM426XX_RA_INT_SOURCE0, ICM426XX_UI_DRDY_INT1_EN_ENABLED);
 
     uint8_t intConfig1Value = spiReadRegMsk(dev, ICM426XX_RA_INT_CONFIG1);
@@ -211,7 +211,6 @@ void icm426xxGyroInit(gyroDev_t *gyro)
     intConfig1Value |= (ICM426XX_INT_TPULSE_DURATION_8 | ICM426XX_INT_TDEASSERT_DISABLED);
 
     spiWriteReg(dev, ICM426XX_RA_INT_CONFIG1, intConfig1Value);
-#endif
 }
 
 bool icm426xxSpiGyroDetect(gyroDev_t *gyro)
diff --git a/src/main/drivers/accgyro/accgyro_spi_l3gd20.c b/src/main/drivers/accgyro/accgyro_spi_l3gd20.c
index f5c82284dd..fb7edf0a16 100644
--- a/src/main/drivers/accgyro/accgyro_spi_l3gd20.c
+++ b/src/main/drivers/accgyro/accgyro_spi_l3gd20.c
@@ -77,7 +77,6 @@
 
 #define BOOT                          ((uint8_t)0x80)
 
-#if defined(USE_MPU_DATA_READY_SIGNAL)
 static void l3gd20ExtiHandler(extiCallbackRec_t *cb)
 {
     gyroDev_t *gyro = container_of(cb, gyroDev_t, exti);
@@ -97,35 +96,34 @@ static void l3gd20IntExtiInit(gyroDev_t *gyro)
     EXTIConfig(mpuIntIO, &gyro->exti, NVIC_PRIO_MPU_INT_EXTI, IOCFG_IN_FLOATING, BETAFLIGHT_EXTI_TRIGGER_RISING);
     EXTIEnable(mpuIntIO);
 }
-#endif
 
 void l3gd20GyroInit(gyroDev_t *gyro)
 {
-    spiSetClkDivisor(&gyro->dev, spiCalculateDivider(L3GD20_MAX_SPI_CLK_HZ));
+    extDevice_t *dev = &gyro->dev;
 
-    spiWriteReg(&gyro->dev, CTRL_REG5_ADDR, BOOT);
+    spiSetClkDivisor(dev, spiCalculateDivider(L3GD20_MAX_SPI_CLK_HZ));
+
+    spiWriteReg(dev, CTRL_REG5_ADDR, BOOT);
 
     delayMicroseconds(100);
 
-    spiWriteReg(&gyro->dev, CTRL_REG1_ADDR, MODE_ACTIVE | OUTPUT_DATARATE_3 | AXES_ENABLE | BANDWIDTH_3);
+    spiWriteReg(dev, CTRL_REG1_ADDR, MODE_ACTIVE | OUTPUT_DATARATE_3 | AXES_ENABLE | BANDWIDTH_3);
 
     delayMicroseconds(1);
 
-    spiWriteReg(&gyro->dev, CTRL_REG4_ADDR, BLOCK_DATA_UPDATE_CONTINUOUS | BLE_MSB | FULLSCALE_2000);
+    spiWriteReg(dev, CTRL_REG4_ADDR, BLOCK_DATA_UPDATE_CONTINUOUS | BLE_MSB | FULLSCALE_2000);
 
     delay(100);
 
-#if defined(USE_MPU_DATA_READY_SIGNAL)
     l3gd20IntExtiInit(gyro);
-#endif
-
 }
 
 static bool l3gd20GyroRead(gyroDev_t *gyro)
 {
     uint8_t buf[6];
+    extDevice_t *dev = &gyro->dev;
 
-    const bool ack = spiReadRegMskBufRB(&gyro->dev, OUT_X_L_ADDR | READ_CMD | MULTIPLEBYTE_CMD,buf, sizeof(buf));
+    const bool ack = spiReadRegMskBufRB(dev, OUT_X_L_ADDR | READ_CMD | MULTIPLEBYTE_CMD,buf, sizeof(buf));
     if (!ack) {
         return false;
     }
diff --git a/src/main/drivers/accgyro/accgyro_spi_lsm6dso.c b/src/main/drivers/accgyro/accgyro_spi_lsm6dso.c
index e80ed1fb8c..0bfdbc09b9 100644
--- a/src/main/drivers/accgyro/accgyro_spi_lsm6dso.c
+++ b/src/main/drivers/accgyro/accgyro_spi_lsm6dso.c
@@ -32,13 +32,11 @@
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
 
-#if defined(USE_GYRO_EXTI) && defined(USE_MPU_DATA_READY_SIGNAL)
 void lsm6dsoExtiHandler(extiCallbackRec_t *cb)
 {
     gyroDev_t *gyro = container_of(cb, gyroDev_t, exti);
     gyro->dataReady = true;
 }
-#endif
 
 bool lsm6dsoAccRead(accDev_t *acc)
 {
diff --git a/src/main/drivers/accgyro/accgyro_spi_lsm6dso_init.c b/src/main/drivers/accgyro/accgyro_spi_lsm6dso_init.c
index 1743be6454..4c38f59eeb 100644
--- a/src/main/drivers/accgyro/accgyro_spi_lsm6dso_init.c
+++ b/src/main/drivers/accgyro/accgyro_spi_lsm6dso_init.c
@@ -147,7 +147,6 @@ static void lsm6dsoConfig(gyroDev_t *gyro)
     lsm6dsoWriteRegisterBits(dev, LSM6DSO_REG_CTRL9_XL, LSM6DSO_MASK_CTRL9_XL, LSM6DSO_VAL_CTRL9_XL_I3C_DISABLE, 1);
 }
 
-#if defined(USE_GYRO_EXTI) && defined(USE_MPU_DATA_READY_SIGNAL)
 static void lsm6dsoIntExtiInit(gyroDev_t *gyro)
 {
     if (gyro->mpuIntExtiTag == IO_TAG_NONE) {
@@ -161,7 +160,6 @@ static void lsm6dsoIntExtiInit(gyroDev_t *gyro)
     EXTIConfig(mpuIntIO, &gyro->exti, NVIC_PRIO_MPU_INT_EXTI, IOCFG_IN_FLOATING, BETAFLIGHT_EXTI_TRIGGER_RISING);
     EXTIEnable(mpuIntIO);
 }
-#endif
 
 static void lsm6dsoSpiGyroInit(gyroDev_t *gyro)
 {
@@ -169,9 +167,7 @@ static void lsm6dsoSpiGyroInit(gyroDev_t *gyro)
 
     lsm6dsoConfig(gyro);
 
-#if defined(USE_GYRO_EXTI) && defined(USE_MPU_DATA_READY_SIGNAL)
     lsm6dsoIntExtiInit(gyro);
-#endif
 
     spiSetClkDivisor(dev, spiCalculateDivider(LSM6DSO_MAX_SPI_CLK_HZ));
 }
diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu6000.c b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c
index c8268c04ee..52b9b068b0 100644
--- a/src/main/drivers/accgyro/accgyro_spi_mpu6000.c
+++ b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c
@@ -103,15 +103,17 @@ static void mpu6000AccAndGyroInit(gyroDev_t *gyro);
 
 void mpu6000SpiGyroInit(gyroDev_t *gyro)
 {
+    extDevice_t *dev = &gyro->dev;
+
     mpuGyroInit(gyro);
 
     mpu6000AccAndGyroInit(gyro);
 
     // Accel and Gyro DLPF Setting
-    spiWriteReg(&gyro->dev, MPU6000_CONFIG, mpuGyroDLPF(gyro));
+    spiWriteReg(dev, MPU6000_CONFIG, mpuGyroDLPF(gyro));
     delayMicroseconds(1);
 
-    spiSetClkDivisor(&gyro->dev, spiCalculateDivider(MPU6000_MAX_SPI_CLK_HZ));
+    spiSetClkDivisor(dev, spiCalculateDivider(MPU6000_MAX_SPI_CLK_HZ));
 
     mpuGyroRead(gyro);
 
@@ -167,39 +169,39 @@ uint8_t mpu6000SpiDetect(const extDevice_t *dev)
 
 static void mpu6000AccAndGyroInit(gyroDev_t *gyro)
 {
+    extDevice_t *dev = &gyro->dev;
+
     // Device was already reset during detection so proceed with configuration
 
     // Clock Source PPL with Z axis gyro reference
-    spiWriteReg(&gyro->dev, MPU_RA_PWR_MGMT_1, MPU_CLK_SEL_PLLGYROZ);
+    spiWriteReg(dev, MPU_RA_PWR_MGMT_1, MPU_CLK_SEL_PLLGYROZ);
     delayMicroseconds(15);
 
     // Disable Primary I2C Interface
-    spiWriteReg(&gyro->dev, MPU_RA_USER_CTRL, BIT_I2C_IF_DIS);
+    spiWriteReg(dev, MPU_RA_USER_CTRL, BIT_I2C_IF_DIS);
     delayMicroseconds(15);
 
-    spiWriteReg(&gyro->dev, MPU_RA_PWR_MGMT_2, 0x00);
+    spiWriteReg(dev, MPU_RA_PWR_MGMT_2, 0x00);
     delayMicroseconds(15);
 
     // Accel Sample Rate 1kHz
     // Gyroscope Output Rate =  1kHz when the DLPF is enabled
-    spiWriteReg(&gyro->dev, MPU_RA_SMPLRT_DIV, gyro->mpuDividerDrops);
+    spiWriteReg(dev, MPU_RA_SMPLRT_DIV, gyro->mpuDividerDrops);
     delayMicroseconds(15);
 
     // Gyro +/- 2000 DPS Full Scale
-    spiWriteReg(&gyro->dev, MPU_RA_GYRO_CONFIG, INV_FSR_2000DPS << 3);
+    spiWriteReg(dev, MPU_RA_GYRO_CONFIG, INV_FSR_2000DPS << 3);
     delayMicroseconds(15);
 
     // Accel +/- 16 G Full Scale
-    spiWriteReg(&gyro->dev, MPU_RA_ACCEL_CONFIG, INV_FSR_16G << 3);
+    spiWriteReg(dev, MPU_RA_ACCEL_CONFIG, INV_FSR_16G << 3);
     delayMicroseconds(15);
 
-    spiWriteReg(&gyro->dev, MPU_RA_INT_PIN_CFG, 0 << 7 | 0 << 6 | 0 << 5 | 1 << 4 | 0 << 3 | 0 << 2 | 0 << 1 | 0 << 0);  // INT_ANYRD_2CLEAR
+    spiWriteReg(dev, MPU_RA_INT_PIN_CFG, 0 << 7 | 0 << 6 | 0 << 5 | 1 << 4 | 0 << 3 | 0 << 2 | 0 << 1 | 0 << 0);  // INT_ANYRD_2CLEAR
     delayMicroseconds(15);
 
-#ifdef USE_MPU_DATA_READY_SIGNAL
-    spiWriteReg(&gyro->dev, MPU_RA_INT_ENABLE, MPU_RF_DATA_RDY_EN);
+    spiWriteReg(dev, MPU_RA_INT_ENABLE, MPU_RF_DATA_RDY_EN);
     delayMicroseconds(15);
-#endif
 }
 
 bool mpu6000SpiAccDetect(accDev_t *acc)
@@ -223,9 +225,8 @@ bool mpu6000SpiGyroDetect(gyroDev_t *gyro)
     gyro->initFn = mpu6000SpiGyroInit;
     gyro->readFn = mpuGyroReadSPI;
     gyro->scale = GYRO_SCALE_2000DPS;
-#ifdef USE_GYRO_EXTI
     gyro->gyroShortPeriod = clockMicrosToCycles(MPU6000_SHORT_THRESHOLD);
-#endif
+
     return true;
 }
 
diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu6500.c b/src/main/drivers/accgyro/accgyro_spi_mpu6500.c
index 59ac8e5cae..9691c77818 100644
--- a/src/main/drivers/accgyro/accgyro_spi_mpu6500.c
+++ b/src/main/drivers/accgyro/accgyro_spi_mpu6500.c
@@ -82,8 +82,6 @@ uint8_t mpu6500SpiDetect(const extDevice_t *dev)
         return mpuDetected;
     }
 
-    spiSetClkDivisor(dev, spiCalculateDivider(MPU6500_MAX_SPI_CLK_HZ));
-
     return mpuDetected;
 }
 
@@ -94,13 +92,15 @@ void mpu6500SpiAccInit(accDev_t *acc)
 
 void mpu6500SpiGyroInit(gyroDev_t *gyro)
 {
+    extDevice_t *dev = &gyro->dev;
+
     mpu6500GyroInit(gyro);
 
     // Disable Primary I2C Interface
-    spiWriteReg(&gyro->dev, MPU_RA_USER_CTRL, MPU6500_BIT_I2C_IF_DIS);
+    spiWriteReg(dev, MPU_RA_USER_CTRL, MPU6500_BIT_I2C_IF_DIS);
     delay(100);
 
-    spiSetClkDivisor(&gyro->dev, spiCalculateDivider(MPU6500_MAX_SPI_CLK_HZ));
+    spiSetClkDivisor(dev, spiCalculateDivider(MPU6500_MAX_SPI_CLK_HZ));
     delayMicroseconds(1);
 }
 
diff --git a/src/main/drivers/accgyro/accgyro_spi_mpu9250.c b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c
index 30de8c785c..c2049368dc 100644
--- a/src/main/drivers/accgyro/accgyro_spi_mpu9250.c
+++ b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c
@@ -70,11 +70,13 @@ static bool mpu9250SpiSlowReadRegisterBuffer(const extDevice_t *dev, uint8_t reg
 
 void mpu9250SpiGyroInit(gyroDev_t *gyro)
 {
+    extDevice_t *dev = &gyro->dev;
+
     mpuGyroInit(gyro);
 
     mpu9250AccAndGyroInit(gyro);
 
-    spiSetClkDivisor(&gyro->dev, spiCalculateDivider(MPU9250_MAX_SPI_CLK_HZ)); //high speed now that we don't need to write to the slow registers
+    spiSetClkDivisor(dev, spiCalculateDivider(MPU9250_MAX_SPI_CLK_HZ)); //high speed now that we don't need to write to the slow registers
 
     mpuGyroRead(gyro);
 
@@ -109,25 +111,23 @@ bool mpu9250SpiWriteRegisterVerify(const extDevice_t *dev, uint8_t reg, uint8_t
 
 static void mpu9250AccAndGyroInit(gyroDev_t *gyro)
 {
-    mpu9250SpiWriteRegister(&gyro->dev, MPU_RA_PWR_MGMT_1, MPU9250_BIT_RESET);
+    extDevice_t *dev = &gyro->dev;
+
+    mpu9250SpiWriteRegister(dev, MPU_RA_PWR_MGMT_1, MPU9250_BIT_RESET);
     delay(50);
 
-    mpu9250SpiWriteRegisterVerify(&gyro->dev, MPU_RA_PWR_MGMT_1, INV_CLK_PLL);
+    mpu9250SpiWriteRegisterVerify(dev, MPU_RA_PWR_MGMT_1, INV_CLK_PLL);
 
-    mpu9250SpiWriteRegisterVerify(&gyro->dev, MPU_RA_GYRO_CONFIG, INV_FSR_2000DPS << 3);
+    mpu9250SpiWriteRegisterVerify(dev, MPU_RA_GYRO_CONFIG, INV_FSR_2000DPS << 3);
 
-    mpu9250SpiWriteRegisterVerify(&gyro->dev, MPU_RA_CONFIG, mpuGyroDLPF(gyro));
+    mpu9250SpiWriteRegisterVerify(dev, MPU_RA_CONFIG, mpuGyroDLPF(gyro));
 
-    mpu9250SpiWriteRegisterVerify(&gyro->dev, MPU_RA_SMPLRT_DIV, gyro->mpuDividerDrops);
+    mpu9250SpiWriteRegisterVerify(dev, MPU_RA_SMPLRT_DIV, gyro->mpuDividerDrops);
 
-    mpu9250SpiWriteRegisterVerify(&gyro->dev, MPU_RA_ACCEL_CONFIG, INV_FSR_16G << 3);
-    mpu9250SpiWriteRegisterVerify(&gyro->dev, MPU_RA_INT_PIN_CFG, 0 << 7 | 0 << 6 | 0 << 5 | 1 << 4 | 0 << 3 | 0 << 2 | 1 << 1 | 0 << 0);  // INT_ANYRD_2CLEAR, BYPASS_EN
+    mpu9250SpiWriteRegisterVerify(dev, MPU_RA_ACCEL_CONFIG, INV_FSR_16G << 3);
+    mpu9250SpiWriteRegisterVerify(dev, MPU_RA_INT_PIN_CFG, 0 << 7 | 0 << 6 | 0 << 5 | 1 << 4 | 0 << 3 | 0 << 2 | 1 << 1 | 0 << 0);  // INT_ANYRD_2CLEAR, BYPASS_EN
 
-#if defined(USE_MPU_DATA_READY_SIGNAL)
-    mpu9250SpiWriteRegisterVerify(&gyro->dev, MPU_RA_INT_ENABLE, 0x01); //this resets register MPU_RA_PWR_MGMT_1 and won't read back correctly.
-#endif
-
-    spiSetClkDivisor(&gyro->dev, spiCalculateDivider(MPU9250_MAX_SPI_CLK_HZ));
+    mpu9250SpiWriteRegisterVerify(dev, MPU_RA_INT_ENABLE, 0x01); //this resets register MPU_RA_PWR_MGMT_1 and won't read back correctly.
 }
 
 uint8_t mpu9250SpiDetect(const extDevice_t *dev)
diff --git a/src/main/drivers/barometer/barometer.h b/src/main/drivers/barometer/barometer.h
index 88afe8a982..1b9f76df2f 100644
--- a/src/main/drivers/barometer/barometer.h
+++ b/src/main/drivers/barometer/barometer.h
@@ -32,9 +32,7 @@ typedef void (*baroCalculateFuncPtr)(int32_t *pressure, int32_t *temperature); /
 // the 'u' in these variable names means 'uncompensated', 't' is temperature, 'p' pressure.
 typedef struct baroDev_s {
     extDevice_t dev;
-#ifdef USE_EXTI
     extiCallbackRec_t exti;
-#endif
     bool combined_read;
     uint16_t ut_delay;
     uint16_t up_delay;
diff --git a/src/main/drivers/barometer/barometer_bmp085.c b/src/main/drivers/barometer/barometer_bmp085.c
index d355c943f3..24c1fcc85b 100644
--- a/src/main/drivers/barometer/barometer_bmp085.c
+++ b/src/main/drivers/barometer/barometer_bmp085.c
@@ -46,7 +46,6 @@ static bool isEOCConnected = false;
 #define BMP085_DATA_FRAME_SIZE 3
 static uint8_t sensor_data[BMP085_DATA_FRAME_SIZE];
 
-#ifdef USE_EXTI
 static IO_t eocIO;
 static extiCallbackRec_t exti;
 
@@ -55,7 +54,6 @@ static void bmp085ExtiHandler(extiCallbackRec_t* cb)
     UNUSED(cb);
     isConversionComplete = true;
 }
-#endif
 
 typedef struct {
     int16_t ac1;
@@ -161,7 +159,6 @@ bool bmp085Detect(const bmp085Config_t *config, baroDev_t *baro)
     bmp085InitXclrIO(config);
     BMP085_ON;   // enable baro
 
-#ifdef USE_EXTI
     // EXTI interrupt for barometer EOC
 
     eocIO = IOGetByTag(config->eocTag);
@@ -169,9 +166,6 @@ bool bmp085Detect(const bmp085Config_t *config, baroDev_t *baro)
     EXTIHandlerInit(&exti, bmp085ExtiHandler);
     EXTIConfig(eocIO, &exti, NVIC_PRIO_BARO_EXTI, IOCFG_IN_FLOATING, BETAFLIGHT_EXTI_TRIGGER_RISING);
     EXTIEnable(eocIO);
-#else
-    UNUSED(config);
-#endif
 
     delay(20); // datasheet says 10ms, we'll be careful and do 20.
 
@@ -212,12 +206,10 @@ bool bmp085Detect(const bmp085Config_t *config, baroDev_t *baro)
         }
     }
 
-#ifdef USE_EXTI
     if (eocIO) {
         IORelease(eocIO);
         EXTIRelease(eocIO);
     }
-#endif
 
     BMP085_OFF;
 
@@ -397,7 +389,6 @@ static bool bmp085TestEOCConnected(baroDev_t *baro, const bmp085Config_t *config
 {
     UNUSED(config);
 
-#ifdef USE_EXTI
     if (!bmp085InitDone && eocIO) {
         // EOC should be low at this point. If not, assume EOC is not working
         if (IORead(eocIO)) {
@@ -413,9 +404,6 @@ static bool bmp085TestEOCConnected(baroDev_t *baro, const bmp085Config_t *config
             return true;
         }
     }
-#else
-    UNUSED(baro);
-#endif
 
     return false; // assume EOC is not connected
 }
diff --git a/src/main/drivers/barometer/barometer_bmp388.c b/src/main/drivers/barometer/barometer_bmp388.c
index 1900e91f4e..df2ffb91f2 100644
--- a/src/main/drivers/barometer/barometer_bmp388.c
+++ b/src/main/drivers/barometer/barometer_bmp388.c
@@ -178,7 +178,6 @@ static bool bmp388ReadUP(baroDev_t *baro);
 
 STATIC_UNIT_TESTED void bmp388Calculate(int32_t *pressure, int32_t *temperature);
 
-#ifdef USE_EXTI
 void bmp388_extiHandler(extiCallbackRec_t* cb)
 {
 #ifdef DEBUG
@@ -192,7 +191,6 @@ void bmp388_extiHandler(extiCallbackRec_t* cb)
     uint8_t intStatus = 0;
     busReadRegisterBuffer(&baro->dev, BMP388_INT_STATUS_REG, &intStatus, 1);
 }
-#endif
 
 void bmp388BusInit(const extDevice_t *dev)
 {
@@ -230,7 +228,6 @@ bool bmp388Detect(const bmp388Config_t *config, baroDev_t *baro)
 {
     delay(20);
 
-#ifdef USE_EXTI
     IO_t baroIntIO = IOGetByTag(config->eocTag);
     if (baroIntIO) {
         IOInit(baroIntIO, OWNER_BARO_EOC, 0);
@@ -238,9 +235,6 @@ bool bmp388Detect(const bmp388Config_t *config, baroDev_t *baro)
         EXTIConfig(baroIntIO, &baro->exti, NVIC_PRIO_BARO_EXTI, IOCFG_IN_FLOATING, BETAFLIGHT_EXTI_TRIGGER_RISING);
         EXTIEnable(baroIntIO);
     }
-#else
-    UNUSED(config);
-#endif
 
     extDevice_t *dev = &baro->dev;
     bool defaultAddressApplied = false;
@@ -265,7 +259,6 @@ bool bmp388Detect(const bmp388Config_t *config, baroDev_t *baro)
 
     busDeviceRegister(dev);
 
-#ifdef USE_EXTI
     if (baroIntIO) {
         uint8_t intCtrlValue = 1 << BMP388_INT_DRDY_EN_BIT |
                                0 << BMP388_INT_FFULL_EN_BIT |
@@ -275,7 +268,6 @@ bool bmp388Detect(const bmp388Config_t *config, baroDev_t *baro)
                                0 << BMP388_INT_OD_BIT;
         busWriteRegister(dev, BMP388_INT_CTRL_REG, intCtrlValue);
     }
-#endif
 
     // read calibration
     busReadRegisterBuffer(dev, BMP388_TRIMMING_NVM_PAR_T1_LSB_REG, (uint8_t *)&bmp388_cal, sizeof(bmp388_calib_param_t));
diff --git a/src/main/drivers/exti.c b/src/main/drivers/exti.c
index 13b4b0a94a..b7422e6d07 100644
--- a/src/main/drivers/exti.c
+++ b/src/main/drivers/exti.c
@@ -24,7 +24,7 @@
 
 #include "platform.h"
 
-#ifdef USE_EXTI
+#if !defined(SIMULATOR_BUILD)
 
 #include "drivers/nvic.h"
 #include "io_impl.h"
@@ -248,3 +248,4 @@ _EXTI_IRQ_HANDLER(EXTI9_5_IRQHandler, 0x03e0);
 _EXTI_IRQ_HANDLER(EXTI15_10_IRQHandler, 0xfc00);
 
 #endif
+
diff --git a/src/main/fc/init.c b/src/main/fc/init.c
index 1e5a926232..43075a6482 100644
--- a/src/main/fc/init.c
+++ b/src/main/fc/init.c
@@ -425,7 +425,7 @@ void init(void)
 #endif
     LED2_ON;
 
-#ifdef USE_EXTI
+#if !defined(SIMULATOR_BUILD)
     EXTIInit();
 #endif
 
diff --git a/src/main/scheduler/scheduler.c b/src/main/scheduler/scheduler.c
index 27482610bf..a721ef7963 100644
--- a/src/main/scheduler/scheduler.c
+++ b/src/main/scheduler/scheduler.c
@@ -538,7 +538,6 @@ FAST_CODE void scheduler(void)
 #endif
             lastTargetCycles = nextTargetCycles;
 
-#ifdef USE_GYRO_EXTI
             gyroDev_t *gyro = gyroActiveDev();
 
             // Bring the scheduler into lock with the gyro
@@ -547,7 +546,7 @@ FAST_CODE void scheduler(void)
                 static uint32_t terminalGyroRateCount = 0;
                 static int32_t sampleRateStartCycles;
 
-                if ((terminalGyroRateCount == 0)) {
+                if (terminalGyroRateCount == 0) {
                     terminalGyroRateCount = gyro->detectedEXTI + GYRO_RATE_COUNT;
                     sampleRateStartCycles = nowCycles;
                 }
@@ -571,7 +570,7 @@ FAST_CODE void scheduler(void)
 
                 accGyroSkew += gyroSkew;
 
-                if ((terminalGyroLockCount == 0)) {
+                if (terminalGyroLockCount == 0) {
                     terminalGyroLockCount = gyro->detectedEXTI + GYRO_LOCK_COUNT;
                 }
 
@@ -584,7 +583,6 @@ FAST_CODE void scheduler(void)
                     accGyroSkew = 0;
                 }
             }
-#endif
        }
     }
 
diff --git a/src/main/target/AIKONF4/target.h b/src/main/target/AIKONF4/target.h
index 68c8ae5c6f..b04444ed26 100644
--- a/src/main/target/AIKONF4/target.h
+++ b/src/main/target/AIKONF4/target.h
@@ -32,7 +32,6 @@
 
 #define INVERTER_PIN_UART1      PC0
 
-#define USE_EXTI
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
@@ -45,9 +44,7 @@
 #define USE_ACC_SPI_MPU6000
 #define USE_ACC_SPI_MPU6500
 
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_BARO
 #define USE_BARO_BMP280
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index 19cdb43649..3a76d76217 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -37,10 +37,7 @@
 #define INVERTER_PIN_UART2      PC15
 
 // MPU interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC14
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           SPI1_NSS_PIN
diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index dc586bc827..86857ff35a 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -35,10 +35,7 @@
 #define BEEPER_INVERTED
 
 // MPU interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC14
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           SPI1_NSS_PIN
diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h
index d3c8582a43..c8c516a95e 100644
--- a/src/main/target/ALIENWHOOP/target.h
+++ b/src/main/target/ALIENWHOOP/target.h
@@ -118,13 +118,10 @@
 /* Motion Processing Unit (MPU) - Invensense 6-axis MPU-6500 or 9-axis MPU-9250
  */
 // Interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC14
 // MPU
 #define GYRO_1_CS_PIN           SPI1_NSS_PIN
 #define GYRO_1_SPI_INSTANCE     SPI1
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 // MAG
 #define USE_MAG
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index 0bd83bece2..690675e282 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -42,11 +42,7 @@
 #define GYRO_1_ALIGN       CW270_DEG
 
 // MPU6000 interrupts
-#define USE_MPU_DATA_READY_SIGNAL
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN       PC4
-#define USE_EXTI
 
 #define USE_MAG
 #define USE_MAG_HMC5883
diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h
index cbb7828e61..485193802a 100644
--- a/src/main/target/ANYFCM7/target.h
+++ b/src/main/target/ANYFCM7/target.h
@@ -42,11 +42,7 @@
 #define GYRO_1_ALIGN       CW270_DEG
 
 // MPU6000 interrupts
-#define USE_MPU_DATA_READY_SIGNAL
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN       PC4
-#define USE_EXTI
 
 #define USE_MAG
 //#define USE_MAG_HMC5883
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index 74f309fb08..0e2b0315bd 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -33,10 +33,7 @@
 #define ENABLE_DSHOT_DMAR       DSHOT_DMAR_OFF
 
 // ICM20689 interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA8
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           SPI1_NSS_PIN
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index 1ea0c7bac4..ac5d12a680 100644
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -45,10 +45,7 @@
 
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_BARO
 #define USE_BARO_BMP280
diff --git a/src/main/target/BETAFPVF4SX1280/target.h b/src/main/target/BETAFPVF4SX1280/target.h
index 5758ec5f05..c52bbceb60 100644
--- a/src/main/target/BETAFPVF4SX1280/target.h
+++ b/src/main/target/BETAFPVF4SX1280/target.h
@@ -78,10 +78,7 @@
 #define USE_ACC_SPI_ICM20689
 #define USE_GYRO_SPI_ICM20689
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN        PB6
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN          SPI1_NSS_PIN
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 138f4e868c..f5eecbe441 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -43,10 +43,7 @@
 //#define INVERTER_PIN_UART1     PC9 // Polarity depends on revision; handled in config.c
 
 // MPU6500 interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC5
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PC4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index 75f80e57c5..c51d5d9b51 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -37,10 +37,7 @@
 #define INVERTER_PIN_UART1        PC0 // PC0 used as inverter select GPIO
 
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN           PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_ACC
 #define USE_GYRO
diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h
index d7e1df5622..2f21b685d7 100644
--- a/src/main/target/CLRACINGF7/target.h
+++ b/src/main/target/CLRACINGF7/target.h
@@ -31,11 +31,8 @@
 #define BEEPER_INVERTED
 
 #define USE_MULTI_GYRO
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 #define GYRO_2_EXTI_PIN         PC14
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_ACC
 #define USE_GYRO
diff --git a/src/main/target/CRAZYBEEF4SX1280/target.h b/src/main/target/CRAZYBEEF4SX1280/target.h
index 078a4881a0..7cb5dfd6af 100644
--- a/src/main/target/CRAZYBEEF4SX1280/target.h
+++ b/src/main/target/CRAZYBEEF4SX1280/target.h
@@ -43,10 +43,7 @@
 #define GYRO_1_SPI_INSTANCE    SPI1
 #define GYRO_1_ALIGN       CW90_DEG
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA1
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h
index 673eec918b..44ce3ebded 100644
--- a/src/main/target/DALRCF405/target.h
+++ b/src/main/target/DALRCF405/target.h
@@ -39,10 +39,7 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_ACC
diff --git a/src/main/target/DALRCF722DUAL/target.h b/src/main/target/DALRCF722DUAL/target.h
index 895fdb4c58..df6505562d 100644
--- a/src/main/target/DALRCF722DUAL/target.h
+++ b/src/main/target/DALRCF722DUAL/target.h
@@ -30,8 +30,6 @@
 #define BEEPER_PIN              PC13
 #define BEEPER_INVERTED
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PB10
 #define GYRO_2_EXTI_PIN         PC4
 
@@ -40,7 +38,6 @@
 #define GYRO_2_CS_PIN                       PA4
 #define GYRO_2_SPI_INSTANCE                 SPI1
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/ELINF722/target.h b/src/main/target/ELINF722/target.h
index 5578a31bf2..2f20be8571 100644
--- a/src/main/target/ELINF722/target.h
+++ b/src/main/target/ELINF722/target.h
@@ -39,10 +39,7 @@
 
 #define USE_ACC_SPI_MPU6500
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_OSD
 #define DEFAULT_FEATURES        (FEATURE_OSD | FEATURE_SOFTSERIAL)
diff --git a/src/main/target/ELLE0/target.h b/src/main/target/ELLE0/target.h
index 63de01bfe3..d96c795efb 100644
--- a/src/main/target/ELLE0/target.h
+++ b/src/main/target/ELLE0/target.h
@@ -30,10 +30,7 @@
 #define LED2_PIN                PC2
 
 // MPU9250 interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PB5
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           PB12
diff --git a/src/main/target/EMAXF4SX1280/target.h b/src/main/target/EMAXF4SX1280/target.h
index 85ee1bb346..be895c9d37 100644
--- a/src/main/target/EMAXF4SX1280/target.h
+++ b/src/main/target/EMAXF4SX1280/target.h
@@ -44,10 +44,7 @@
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA1
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
@@ -82,9 +79,9 @@
 #define USE_RX_SX1280
 
 #define RX_SPI_LED_INVERTED
-#define RX_SPI_BIND_PIN			PB2
-#define RX_SPI_EXTI_PIN             	PC14
-#define RX_SPI_LED_PIN              	PB9
+#define RX_SPI_BIND_PIN                 PB2
+#define RX_SPI_EXTI_PIN                 PC14
+#define RX_SPI_LED_PIN                  PB9
 #define RX_EXPRESSLRS_SPI_RESET_PIN     PA8
 #define RX_EXPRESSLRS_SPI_BUSY_PIN      PA13
 #define RX_EXPRESSLRS_TIMER_INSTANCE    TIM3
@@ -120,7 +117,7 @@
 #define DEFAULT_FEATURES                (FEATURE_OSD | FEATURE_TELEMETRY )
 #define DEFAULT_VOLTAGE_METER_SOURCE    VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE    CURRENT_METER_ADC
-#define CURRENT_METER_SCALE_DEFAULT 	179
+#define CURRENT_METER_SCALE_DEFAULT     179
 
 #define TARGET_IO_PORTA         0xffff
 #define TARGET_IO_PORTB         0xffff
diff --git a/src/main/target/EXF722DUAL/target.h b/src/main/target/EXF722DUAL/target.h
index e20eafe03b..01b3f8e616 100644
--- a/src/main/target/EXF722DUAL/target.h
+++ b/src/main/target/EXF722DUAL/target.h
@@ -32,12 +32,9 @@
 #define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA8
 #define GYRO_2_EXTI_PIN         PB2
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index 8c9de6b1e0..09be31eb88 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -35,10 +35,7 @@
 
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PB0
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h
index f84c39e2cf..4638a24577 100644
--- a/src/main/target/FF_FORTINIF4/target.h
+++ b/src/main/target/FF_FORTINIF4/target.h
@@ -51,10 +51,7 @@
 
 /*------------SENSORS--------------*/
 // MPU interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h
index 7a871e78cc..c489ffebfa 100644
--- a/src/main/target/FF_PIKOF4/target.h
+++ b/src/main/target/FF_PIKOF4/target.h
@@ -45,10 +45,7 @@
 
 /*------------SENSORS--------------*/
 // MPU interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #if defined(FF_PIKOF4OSD)
diff --git a/src/main/target/FF_RACEPIT/target.h b/src/main/target/FF_RACEPIT/target.h
index 5336b8147b..1de1cea155 100644
--- a/src/main/target/FF_RACEPIT/target.h
+++ b/src/main/target/FF_RACEPIT/target.h
@@ -44,10 +44,8 @@
 
 /*------------SENSORS--------------*/
 // MPU interrupt
-#define USE_EXTI
 #define GYRO_1_INT_EXTI_PIN     PC4
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index daf2a8a570..f227772dd6 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -37,10 +37,7 @@
 
 #define INVERTER_PIN_UART6      PC8
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 // *************** Gyro & ACC **********************
 #define USE_SPI
diff --git a/src/main/target/FLYWOOF411/target.h b/src/main/target/FLYWOOF411/target.h
index 4e8f688d42..185e92848c 100644
--- a/src/main/target/FLYWOOF411/target.h
+++ b/src/main/target/FLYWOOF411/target.h
@@ -43,10 +43,7 @@
 #define GYRO_1_SPI_INSTANCE    SPI1
 #define GYRO_1_ALIGN      CW180_DEG
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PB3
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
@@ -127,7 +124,7 @@
 
 #define USE_LED_STRIP
 
-#define ENABLE_DSHOT_DMAR       DSHOT_DMAR_ON									
+#define ENABLE_DSHOT_DMAR       DSHOT_DMAR_ON
 #define USE_PINIO
 #define PINIO1_PIN              PB5  // VTX  switcher
 //#define PINIO2_PIN              PA15 // Camera switcher
diff --git a/src/main/target/FLYWOOF7DUAL/target.h b/src/main/target/FLYWOOF7DUAL/target.h
index e96a4649df..b22ee5a94e 100644
--- a/src/main/target/FLYWOOF7DUAL/target.h
+++ b/src/main/target/FLYWOOF7DUAL/target.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#define USE_TARGET_CONFIG					 
+#define USE_TARGET_CONFIG
 #define TARGET_BOARD_IDENTIFIER "FWF7"
 #define USBD_PRODUCT_STRING  "FLYWOOF7DUAL"
 
@@ -32,8 +32,6 @@
 #define BEEPER_PIN              PC14
 #define BEEPER_INVERTED
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC3
 #define GYRO_2_EXTI_PIN         PC4
 
@@ -42,7 +40,6 @@
 #define GYRO_2_CS_PIN                       PB2
 #define GYRO_2_SPI_INSTANCE                 SPI1
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/FOXEERF405/target.h b/src/main/target/FOXEERF405/target.h
index 3cf04ce287..d5720baa8c 100644
--- a/src/main/target/FOXEERF405/target.h
+++ b/src/main/target/FOXEERF405/target.h
@@ -39,10 +39,7 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_ACC
diff --git a/src/main/target/FOXEERF722DUAL/target.h b/src/main/target/FOXEERF722DUAL/target.h
index 92672b15f9..cfe9debed4 100644
--- a/src/main/target/FOXEERF722DUAL/target.h
+++ b/src/main/target/FOXEERF722DUAL/target.h
@@ -30,8 +30,6 @@
 #define BEEPER_PIN              PA4
 #define BEEPER_INVERTED
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 #define GYRO_2_EXTI_PIN         PB0
 
@@ -40,7 +38,6 @@
 #define GYRO_2_CS_PIN                       PB1
 #define GYRO_2_SPI_INSTANCE                 SPI1
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h
index 2d641f5ea5..36503956f0 100644
--- a/src/main/target/FRSKYF4/target.h
+++ b/src/main/target/FRSKYF4/target.h
@@ -42,10 +42,7 @@
 
 #define GYRO_1_ALIGN            CW270_DEG
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_BARO
 #define USE_BARO_BMP280
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index 017deca1bd..c7af9ac2c0 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -40,10 +40,7 @@
 #define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/HAKRCF405/target.h b/src/main/target/HAKRCF405/target.h
index 2c2e35d9e4..58e97a30d5 100644
--- a/src/main/target/HAKRCF405/target.h
+++ b/src/main/target/HAKRCF405/target.h
@@ -50,10 +50,7 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_ACC
diff --git a/src/main/target/HAKRCF411/target.h b/src/main/target/HAKRCF411/target.h
index dbf4b14401..f49b0a1f7a 100644
--- a/src/main/target/HAKRCF411/target.h
+++ b/src/main/target/HAKRCF411/target.h
@@ -51,10 +51,7 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PB2
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_ACC
diff --git a/src/main/target/HAKRCF722/target.h b/src/main/target/HAKRCF722/target.h
index 125406676c..5b36b02b8f 100644
--- a/src/main/target/HAKRCF722/target.h
+++ b/src/main/target/HAKRCF722/target.h
@@ -50,10 +50,7 @@
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/IFLIGHT_H743_AIO/target.h b/src/main/target/IFLIGHT_H743_AIO/target.h
index 53dc9f8eec..f761307456 100644
--- a/src/main/target/IFLIGHT_H743_AIO/target.h
+++ b/src/main/target/IFLIGHT_H743_AIO/target.h
@@ -120,11 +120,8 @@
 #define USE_ACCGYRO_BMI270
 #define USE_ACCGYRO_LSM6DSO
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PD0
 #define GYRO_2_EXTI_PIN         PD8
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           SPI1_NSS_PIN
diff --git a/src/main/target/IFLIGHT_H743_AIO_V2/target.h b/src/main/target/IFLIGHT_H743_AIO_V2/target.h
index eb286bb627..be2108c3e5 100644
--- a/src/main/target/IFLIGHT_H743_AIO_V2/target.h
+++ b/src/main/target/IFLIGHT_H743_AIO_V2/target.h
@@ -120,11 +120,8 @@
 #define USE_ACCGYRO_BMI270
 #define USE_ACCGYRO_LSM6DSO
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PD0
 #define GYRO_2_EXTI_PIN         PD8
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           SPI1_NSS_PIN
diff --git a/src/main/target/JHEF7DUAL/target.h b/src/main/target/JHEF7DUAL/target.h
index 554881bf40..1424b288c0 100644
--- a/src/main/target/JHEF7DUAL/target.h
+++ b/src/main/target/JHEF7DUAL/target.h
@@ -33,8 +33,6 @@
 #define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 #define GYRO_2_EXTI_PIN         PC3
 
@@ -44,7 +42,6 @@
 #define GYRO_2_CS_PIN           PA4
 #define GYRO_2_SPI_INSTANCE     SPI1
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index d9cf287e9c..08b2c7fce7 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -53,10 +53,7 @@
 #define INVERTER_PIN_UART3      PB15
 
 // ICM20689 interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC5
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           PC4
diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h
index ad46b04533..7dcd6fdd2b 100644
--- a/src/main/target/KAKUTEF7/target.h
+++ b/src/main/target/KAKUTEF7/target.h
@@ -47,7 +47,6 @@
 
 #define USE_ACC
 #define USE_GYRO
-#define USE_EXTI
 
 // MPU6000
 #define USE_ACC_SPI_MPU6000
@@ -60,9 +59,7 @@
 #define GYRO_1_SPI_INSTANCE     SPI4
 #define GYRO_1_ALIGN            CW270_DEG
 
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PE1
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_VCP
 #define USE_USB_DETECT
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index bf1704851a..5bf1d49255 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -48,10 +48,7 @@
 #define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h
index 99ca3ac0c5..ff74825712 100644
--- a/src/main/target/KROOZX/target.h
+++ b/src/main/target/KROOZX/target.h
@@ -41,9 +41,6 @@
 #define GYRO_1_SPI_INSTANCE     SPI1
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_MPU_DATA_READY_SIGNAL
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA4
 
 #define USE_GYRO
diff --git a/src/main/target/MAMBAF411/target.h b/src/main/target/MAMBAF411/target.h
index 914e1e10d4..068a193066 100644
--- a/src/main/target/MAMBAF411/target.h
+++ b/src/main/target/MAMBAF411/target.h
@@ -41,10 +41,7 @@
 
 // ******* GYRO and ACC ********
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PB0
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/MAMBAF722/target.h b/src/main/target/MAMBAF722/target.h
index 92af4fb1f1..674c548fba 100644
--- a/src/main/target/MAMBAF722/target.h
+++ b/src/main/target/MAMBAF722/target.h
@@ -41,10 +41,7 @@
 
 // ******* GYRO and ACC ********
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index abe3612829..51967fb61e 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -46,10 +46,7 @@
 #define GYRO_1_CS_PIN           PC2
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC3
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/MATEKF411/target.h b/src/main/target/MATEKF411/target.h
index 1827c037fe..77a0d2b13c 100644
--- a/src/main/target/MATEKF411/target.h
+++ b/src/main/target/MATEKF411/target.h
@@ -44,10 +44,7 @@
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA1
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/MATEKF411RX/target.h b/src/main/target/MATEKF411RX/target.h
index c5caac22c9..7e4e9d1ac9 100644
--- a/src/main/target/MATEKF411RX/target.h
+++ b/src/main/target/MATEKF411RX/target.h
@@ -54,10 +54,7 @@
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA1
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h
index ca5d918522..47c4393cb0 100644
--- a/src/main/target/MATEKF722/target.h
+++ b/src/main/target/MATEKF722/target.h
@@ -44,10 +44,7 @@
 #define GYRO_1_CS_PIN           PC2
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC3
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6500
diff --git a/src/main/target/MATEKF722SE/target.h b/src/main/target/MATEKF722SE/target.h
index 83acdfd2e4..22a50999d7 100644
--- a/src/main/target/MATEKF722SE/target.h
+++ b/src/main/target/MATEKF722SE/target.h
@@ -42,8 +42,6 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 #define GYRO_2_EXTI_PIN         PC3
 
@@ -64,7 +62,6 @@
 
 #define GYRO_2_ALIGN            CW90_DEG
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 #define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_1
 
diff --git a/src/main/target/MATEKH743/target.h b/src/main/target/MATEKH743/target.h
index 50d97a8135..d9ba69bc29 100644
--- a/src/main/target/MATEKH743/target.h
+++ b/src/main/target/MATEKH743/target.h
@@ -38,8 +38,6 @@
 #define USE_SPI
 #define USE_GYRO
 #define USE_ACC
-#define USE_EXTI
-#define USE_GYRO_EXTI
 
 #define USE_SPI_DEVICE_1
 #define GYRO_1_SPI_INSTANCE     SPI1   //MPU6000
@@ -65,7 +63,6 @@
 #define USE_ACC_SPI_MPU6500
 #define GYRO_2_ALIGN            CW0_DEG_FLIP
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 #define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_1
 
diff --git a/src/main/target/MERAKRCF405/target.h b/src/main/target/MERAKRCF405/target.h
index 5542af44b7..c391a25b33 100644
--- a/src/main/target/MERAKRCF405/target.h
+++ b/src/main/target/MERAKRCF405/target.h
@@ -40,10 +40,7 @@
 #define GYRO_1_CS_PIN           PB12
 #define GYRO_1_SPI_INSTANCE     SPI2
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/MERAKRCF722/target.h b/src/main/target/MERAKRCF722/target.h
index e478889dad..b050b39c3f 100644
--- a/src/main/target/MERAKRCF722/target.h
+++ b/src/main/target/MERAKRCF722/target.h
@@ -40,10 +40,7 @@
 #define GYRO_1_CS_PIN           PB12
 #define GYRO_1_SPI_INSTANCE     SPI2
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index 2bcf61cd58..52593ec2b4 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -33,9 +33,7 @@
 
 #define INVERTER_PIN_UART2      PB2 // PB2 (BOOT1) abused as inverter select GPIO
 
-#define USE_EXTI
 #define MAG_INT_EXTI            PC14
-#define USE_MPU_DATA_READY_SIGNAL
 #define USE_MAG_DATA_READY_SIGNAL
 
 // SPI2
diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h
index f4958b128c..522d73362c 100644
--- a/src/main/target/MOTOLABF4/target.h
+++ b/src/main/target/MOTOLABF4/target.h
@@ -49,10 +49,7 @@
 #define USE_GYRO_SPI_MPU6000
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC5
-#define USE_MPU_DATA_READY_SIGNAL
 //#define ENSURE_MPU_DATA_READY_IS_LOW
 //#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
 
diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h
index 790709951a..7c24ff3620 100644
--- a/src/main/target/NERO/target.h
+++ b/src/main/target/NERO/target.h
@@ -36,10 +36,7 @@
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PB2
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PC4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/NEUTRONRCF411SX1280/target.h b/src/main/target/NEUTRONRCF411SX1280/target.h
index 1626fdff63..e6071bc211 100644
--- a/src/main/target/NEUTRONRCF411SX1280/target.h
+++ b/src/main/target/NEUTRONRCF411SX1280/target.h
@@ -56,10 +56,7 @@
 #define USE_ACC_SPI_ICM42688P
 #define USE_ACCGYRO_LSM6DSO
 #define USE_ACCGYRO_BMI270
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN        PB6
-#define USE_MPU_DATA_READY_SIGNAL
 #define GYRO_1_CS_PIN          SPI1_NSS_PIN
 #define GYRO_1_SPI_INSTANCE    SPI1
 #define GYRO_1_ALIGN           CW90_DEG
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index dcb56f960b..e60b7ed689 100644
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -45,11 +45,8 @@
 #define GYRO_1_SPI_INSTANCE     SPI2
 
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA8
 
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_BARO
 #define USE_BARO_BMP280
diff --git a/src/main/target/NUCLEOF446RE/target.h b/src/main/target/NUCLEOF446RE/target.h
index 0766c2e7f3..d7575d2cff 100644
--- a/src/main/target/NUCLEOF446RE/target.h
+++ b/src/main/target/NUCLEOF446RE/target.h
@@ -30,7 +30,6 @@
 //#define USE_BEEPER
 //#define BEEPER_PIN                PD12
 
-#define USE_EXTI
 
 #define USE_SPI
 //#define USE_SPI_DEVICE_1
@@ -54,11 +53,8 @@
 #define GYRO_1_SPI_INSTANCE     SPI2
 #define GYRO_1_CS_PIN           PB12
 
-#define USE_EXTI
 
-//#define USE_GYRO_EXTI
 //#define GYRO_1_EXTI_PIN PC13
-//#define USE_MPU_DATA_READY_SIGNAL
 //#define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_BARO
diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h
index 3a6d85e5d3..30330783e1 100644
--- a/src/main/target/NUCLEOF7/target.h
+++ b/src/main/target/NUCLEOF7/target.h
@@ -45,11 +45,7 @@
 #define GYRO_1_ALIGN       CW270_DEG
 
 // MPU6050 interrupts
-#define USE_MPU_DATA_READY_SIGNAL
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN    PB15
-#define USE_EXTI
 
 #define USE_MAG
 #define USE_FAKE_MAG
diff --git a/src/main/target/NUCLEOF722/target.h b/src/main/target/NUCLEOF722/target.h
index 61eb2db4fa..1d7f9ee675 100644
--- a/src/main/target/NUCLEOF722/target.h
+++ b/src/main/target/NUCLEOF722/target.h
@@ -45,11 +45,7 @@
 #define GYRO_1_ALIGN       CW270_DEG
 
 // MPU6050 interrupts
-#define USE_MPU_DATA_READY_SIGNAL
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN PB15
-#define USE_EXTI
 
 #define USE_MAG
 #define USE_FAKE_MAG
diff --git a/src/main/target/NUCLEOH723ZG/target.h b/src/main/target/NUCLEOH723ZG/target.h
index 252d01d66f..cee9efc4d7 100644
--- a/src/main/target/NUCLEOH723ZG/target.h
+++ b/src/main/target/NUCLEOH723ZG/target.h
@@ -226,7 +226,6 @@
 #define USE_TIMER
 #define USE_PWM_OUTPUT
 #define USE_MOTOR
-#define USE_EXTI
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_HCSR04
diff --git a/src/main/target/NUCLEOH725ZG/target.h b/src/main/target/NUCLEOH725ZG/target.h
index 0d35057826..423f8bfa6c 100644
--- a/src/main/target/NUCLEOH725ZG/target.h
+++ b/src/main/target/NUCLEOH725ZG/target.h
@@ -235,7 +235,6 @@
 #define USE_TIMER
 #define USE_PWM_OUTPUT
 #define USE_MOTOR
-#define USE_EXTI
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_HCSR04
diff --git a/src/main/target/NUCLEOH743/target.h b/src/main/target/NUCLEOH743/target.h
index 3573b54833..3a0796fd43 100644
--- a/src/main/target/NUCLEOH743/target.h
+++ b/src/main/target/NUCLEOH743/target.h
@@ -240,7 +240,6 @@
 #define USE_TIMER
 #define USE_PWM_OUTPUT
 #define USE_MOTOR
-#define USE_EXTI
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_HCSR04
diff --git a/src/main/target/NUCLEOH7A3ZI/target.h b/src/main/target/NUCLEOH7A3ZI/target.h
index 98339ce8b4..918b706bb9 100644
--- a/src/main/target/NUCLEOH7A3ZI/target.h
+++ b/src/main/target/NUCLEOH7A3ZI/target.h
@@ -226,7 +226,6 @@
 #define USE_TIMER
 #define USE_PWM_OUTPUT
 #define USE_MOTOR
-#define USE_EXTI
 
 #define USE_RANGEFINDER
 #define USE_RANGEFINDER_HCSR04
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 26fa2e6292..8f5770f9cb 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -76,7 +76,6 @@
 #define INVERTER_PIN_UART1      PC0 // DYS F4 Pro; Omnibus F4 AIO (1st gen) have a FIXED inverter on UART1
 #endif
 
-#define USE_EXTI
 
 #define USE_ACC
 #define USE_ACC_SPI_MPU6000
@@ -88,9 +87,7 @@
 #define GYRO_1_SPI_INSTANCE     SPI1
 
 // MPU6000 interrupts
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #if defined(OMNIBUSF4SD)
 #define GYRO_1_ALIGN            CW270_DEG
diff --git a/src/main/target/OMNIBUSF4FW/target.h b/src/main/target/OMNIBUSF4FW/target.h
index 803d3e9a15..bf7c28e6e3 100644
--- a/src/main/target/OMNIBUSF4FW/target.h
+++ b/src/main/target/OMNIBUSF4FW/target.h
@@ -84,11 +84,8 @@
 #define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_1
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 #define GYRO_2_EXTI_PIN         NONE
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_MAG
 #define MAG_I2C_INSTANCE        (I2CDEV_1)
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index 85aaad03c1..fb3d278dcc 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -52,9 +52,6 @@
 #define USE_ACC_SPI_MPU6000
 #define USE_GYRO_SPI_MPU6000
 
-//#define USE_MPU_DATA_READY_SIGNAL
-#define USE_EXTI
-#define USE_GYRO_EXTI
 
 #if defined(OMNIBUSF7V2)
 #define GYRO_1_SPI_INSTANCE     SPI3
diff --git a/src/main/target/OMNINXT/target.h b/src/main/target/OMNINXT/target.h
index 4b16c84ced..5f251dc74b 100644
--- a/src/main/target/OMNINXT/target.h
+++ b/src/main/target/OMNINXT/target.h
@@ -47,9 +47,6 @@
 #define USE_ACC
 #define USE_GYRO
 // MPU interrupts
-//#define USE_EXTI
-//#define USE_GYRO_EXTI
-//#define USE_MPU_DATA_READY_SIGNAL
 
 // For debugging with NUC405RG
 #define USE_FAKE_ACC
diff --git a/src/main/target/PYRODRONEF4/target.h b/src/main/target/PYRODRONEF4/target.h
index 33c3758727..5d196a7040 100644
--- a/src/main/target/PYRODRONEF4/target.h
+++ b/src/main/target/PYRODRONEF4/target.h
@@ -29,10 +29,7 @@
 
 #define INVERTER_PIN_UART1        PC3       // PC3 used as sBUS inverter select GPIO
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 // DEFINE SPI USAGE
 #define USE_SPI
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 74bf09c17c..1025be749d 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -145,10 +145,7 @@
 #endif
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #if defined(ELINF405)
 
diff --git a/src/main/target/REVOLT/target.h b/src/main/target/REVOLT/target.h
index ca21defdca..e9f1a0a41a 100644
--- a/src/main/target/REVOLT/target.h
+++ b/src/main/target/REVOLT/target.h
@@ -91,10 +91,7 @@
 
 #define GYRO_1_ALIGN            CW0_DEG
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 /*----------Flash Config--------*/
 #define FLASH_CS_PIN            PB3
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index ec4270da41..cf49a6a8cf 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -53,10 +53,7 @@
 #define USE_MAG_MPU925X_AK8963
 
 // MPU6500 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PA15
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_VCP
 #define USE_USB_DETECT
diff --git a/src/main/target/RUSHCORE7/target.h b/src/main/target/RUSHCORE7/target.h
index 0bc3420882..b6694251b8 100644
--- a/src/main/target/RUSHCORE7/target.h
+++ b/src/main/target/RUSHCORE7/target.h
@@ -31,9 +31,6 @@
 #define BEEPER_INVERTED
 //#define BEEPER_PWM_HZ           1100
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
-#define USE_MPU_DATA_READY_SIGNAL                   
 
 #define USE_ACC
 #define USE_GYRO
diff --git a/src/main/target/SKYZONEF405/target.h b/src/main/target/SKYZONEF405/target.h
index 4d2ddb719d..27d06aed94 100644
--- a/src/main/target/SKYZONEF405/target.h
+++ b/src/main/target/SKYZONEF405/target.h
@@ -40,10 +40,7 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_ACC
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index d2689104df..9386f004ed 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -37,10 +37,7 @@
 #define INVERTER_PIN_UART6      PC6
 
 // MPU9250 interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC5
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           PC4
diff --git a/src/main/target/SPEEDYBEEF4/target.h b/src/main/target/SPEEDYBEEF4/target.h
index 20a224e644..10690382ba 100644
--- a/src/main/target/SPEEDYBEEF4/target.h
+++ b/src/main/target/SPEEDYBEEF4/target.h
@@ -43,10 +43,7 @@
 #define GYRO_1_CS_PIN           PB11
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/SPEEDYBEEF7/target.h b/src/main/target/SPEEDYBEEF7/target.h
index 3806188b87..6c9f3aa251 100644
--- a/src/main/target/SPEEDYBEEF7/target.h
+++ b/src/main/target/SPEEDYBEEF7/target.h
@@ -43,10 +43,7 @@
 #define GYRO_1_CS_PIN           PA4
 #define GYRO_1_SPI_INSTANCE     SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_ICM20689
diff --git a/src/main/target/SPEKTRUMF400/target.h b/src/main/target/SPEKTRUMF400/target.h
index ffeca20027..0a6ddf1d67 100644
--- a/src/main/target/SPEKTRUMF400/target.h
+++ b/src/main/target/SPEKTRUMF400/target.h
@@ -63,10 +63,7 @@
 #define GYRO_1_CS_PIN           PB12
 #define GYRO_1_SPI_INSTANCE     SPI2
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC13
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_VCP
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index 7d45f106be..00918791de 100644
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -37,13 +37,10 @@
 
 #define INVERTER_PIN_UART2      PB2
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC13
 #ifdef SPRACINGF4EVODG
 #define GYRO_2_EXTI_PIN         PC5 // GYRO 2 / NC on prototype boards, but if it was it'd be here.
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 #endif
 
diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h
index b35a5599b7..bcf442d925 100644
--- a/src/main/target/SPRACINGF4NEO/target.h
+++ b/src/main/target/SPRACINGF4NEO/target.h
@@ -54,11 +54,8 @@
     #define INVERTER_PIN_UART2              PA0
 #endif
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN                     PC13
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_MAG_DATA_READY_SIGNAL
diff --git a/src/main/target/SPRACINGF7DUAL/target.h b/src/main/target/SPRACINGF7DUAL/target.h
index 92eb42bfb5..f2ba28d80e 100644
--- a/src/main/target/SPRACINGF7DUAL/target.h
+++ b/src/main/target/SPRACINGF7DUAL/target.h
@@ -41,12 +41,9 @@
 #define BEEPER_PIN              PC15
 #define BEEPER_INVERTED
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC13
 #define GYRO_2_EXTI_PIN         PC14
 
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_GYRO
diff --git a/src/main/target/SPRACINGH7EXTREME/target.h b/src/main/target/SPRACINGH7EXTREME/target.h
index 3af9f095fe..d525c99df0 100644
--- a/src/main/target/SPRACINGH7EXTREME/target.h
+++ b/src/main/target/SPRACINGH7EXTREME/target.h
@@ -141,11 +141,8 @@
 #define USE_MULTI_GYRO
 #undef USE_GYRO_REGISTER_DUMP
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PD4
 #define GYRO_2_EXTI_PIN         PE15
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define GYRO_1_CS_PIN           SPI3_NSS_PIN
diff --git a/src/main/target/SPRACINGH7NANO/target.h b/src/main/target/SPRACINGH7NANO/target.h
index 2188ffbdad..b7f6cbed11 100644
--- a/src/main/target/SPRACINGH7NANO/target.h
+++ b/src/main/target/SPRACINGH7NANO/target.h
@@ -147,11 +147,8 @@
 #define USE_MULTI_GYRO
 #undef USE_GYRO_REGISTER_DUMP
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PE15
 #define GYRO_2_EXTI_PIN         PD4
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 
diff --git a/src/main/target/SPRACINGH7ZERO/target.h b/src/main/target/SPRACINGH7ZERO/target.h
index 4a16f54564..53bed03e55 100644
--- a/src/main/target/SPRACINGH7ZERO/target.h
+++ b/src/main/target/SPRACINGH7ZERO/target.h
@@ -145,11 +145,8 @@
 #define USE_MULTI_GYRO
 #undef USE_GYRO_REGISTER_DUMP
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PD4
 #define GYRO_2_EXTI_PIN         PE15
-#define USE_MPU_DATA_READY_SIGNAL
 #define ENSURE_MPU_DATA_READY_IS_LOW
 
 
diff --git a/src/main/target/STM32F411DISCOVERY/target.h b/src/main/target/STM32F411DISCOVERY/target.h
index 838c84ac24..bc3cc144b8 100644
--- a/src/main/target/STM32F411DISCOVERY/target.h
+++ b/src/main/target/STM32F411DISCOVERY/target.h
@@ -47,10 +47,7 @@
 #define GYRO_1_CS_PIN           PE3
 #define GYRO_1_ALIGN            CW180_DEG
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PE1
-#define USE_MPU_DATA_READY_SIGNAL
 
 // Acc
 #define USE_ACC
diff --git a/src/main/target/STM32F4DISCOVERY/target.h b/src/main/target/STM32F4DISCOVERY/target.h
index 1a8aca68e1..65666fb3d5 100644
--- a/src/main/target/STM32F4DISCOVERY/target.h
+++ b/src/main/target/STM32F4DISCOVERY/target.h
@@ -39,10 +39,7 @@
 #define LED1_INVERTED
 
 // MPU6500 interrupt
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define GYRO_1_CS_PIN           PC4
 #define GYRO_1_SPI_INSTANCE     SPI1
diff --git a/src/main/target/STM32_UNIFIED/target.h b/src/main/target/STM32_UNIFIED/target.h
index 341fd7875c..adf88a34ab 100644
--- a/src/main/target/STM32_UNIFIED/target.h
+++ b/src/main/target/STM32_UNIFIED/target.h
@@ -278,9 +278,6 @@
 #define USE_BEEPER
 
 // MPU interrupt
-#define USE_EXTI
-#define USE_MPU_DATA_READY_SIGNAL
-#define USE_GYRO_EXTI
 
 #define USE_ACC
 #define USE_GYRO
diff --git a/src/main/target/TMOTORF4/target.h b/src/main/target/TMOTORF4/target.h
index cc851f85ff..b41109cec2 100644
--- a/src/main/target/TMOTORF4/target.h
+++ b/src/main/target/TMOTORF4/target.h
@@ -33,10 +33,7 @@
 
 #define ENABLE_DSHOT_DMAR       DSHOT_DMAR_ON
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/TMOTORF7/target.h b/src/main/target/TMOTORF7/target.h
index 501f9d10b9..7fdcf10339 100644
--- a/src/main/target/TMOTORF7/target.h
+++ b/src/main/target/TMOTORF7/target.h
@@ -32,10 +32,7 @@
 
 #define ENABLE_DSHOT_DMAR       DSHOT_DMAR_OFF
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/TRANSTECF411/target.h b/src/main/target/TRANSTECF411/target.h
index d75380b3f3..b1c55adf20 100644
--- a/src/main/target/TRANSTECF411/target.h
+++ b/src/main/target/TRANSTECF411/target.h
@@ -49,10 +49,7 @@
 #define GYRO_1_CS_PIN                       PA4
 #define GYRO_1_SPI_INSTANCE                 SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN                     PA1
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/TRANSTECF7/target.h b/src/main/target/TRANSTECF7/target.h
index 412edd4551..a903963c1e 100644
--- a/src/main/target/TRANSTECF7/target.h
+++ b/src/main/target/TRANSTECF7/target.h
@@ -53,10 +53,7 @@
 #define GYRO_1_CS_PIN                   PC2
 #define GYRO_1_SPI_INSTANCE             SPI1
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN                 PC3
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO_MPU6000
 #define USE_GYRO_SPI_MPU6000
diff --git a/src/main/target/UAVPNG030MINI/target.h b/src/main/target/UAVPNG030MINI/target.h
index 88f3e6708a..50f12b89bf 100644
--- a/src/main/target/UAVPNG030MINI/target.h
+++ b/src/main/target/UAVPNG030MINI/target.h
@@ -41,10 +41,7 @@
 #define GYRO_1_ALIGN           CW180_DEG
 
 // MPU6000 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN          PE0
-#define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_MAG
 #define USE_MAG_HMC5883
diff --git a/src/main/target/VGOODRCF4/target.h b/src/main/target/VGOODRCF4/target.h
index 0b6755ebf3..cec27f7c31 100644
--- a/src/main/target/VGOODRCF4/target.h
+++ b/src/main/target/VGOODRCF4/target.h
@@ -20,9 +20,9 @@
  #pragma once
 
 //#define USE_TARGET_CONFIG
-#define TARGET_BOARD_IDENTIFIER	"VGF4"
-#define TARGET_MANUFACTURER_IDENTIFIER	"VGRC"
-#define USBD_PRODUCT_STRING	"VGOODRCF4"
+#define TARGET_BOARD_IDENTIFIER         "VGF4"
+#define TARGET_MANUFACTURER_IDENTIFIER  "VGRC"
+#define USBD_PRODUCT_STRING             "VGOODRCF4"
 
 #define LED0_PIN                PC14
 #define LED1_PIN                PC15
@@ -35,11 +35,8 @@
 
 #define GYRO_1_ALIGN            CW180_DEG
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
-#define GYRO_1_EXTI_PIN      	PC3 
+#define GYRO_1_EXTI_PIN         PC3
 
-#define USE_MPU_DATA_READY_SIGNAL
 //#define ENSURE_MPU_DATA_READY_IS_LOW
 
 #define USE_ACC
@@ -47,7 +44,7 @@
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
 
-#define GYRO_1_CS_PIN   					PA15                      
+#define GYRO_1_CS_PIN                       PA15
 #define GYRO_1_SPI_INSTANCE                 SPI3
 
 //-------------------------------------SPI2 FLASH------------------------------
@@ -119,11 +116,11 @@
 
 //-------------------------------------ADC METERE------------------------------
 #define USE_ADC
-#define ADC_INSTANCE			ADC2
+#define ADC_INSTANCE            ADC2
 #define ADC2_DMA_OPT            1
 #define CURRENT_METER_ADC_PIN   PC0  
-#define VBAT_ADC_PIN			PC1
-#define RSSI_ADC_PIN			PC2
+#define VBAT_ADC_PIN            PC1
+#define RSSI_ADC_PIN            PC2
 
 //---------------------------------VTX&&CAM------------------------------------
 #define USE_PINIO
@@ -133,7 +130,7 @@
 
 //-------------------------------------SPI------------------------------------
 #define USE_SPI
-#define USE_SPI_DEVICE_3		//GYRO
+#define USE_SPI_DEVICE_3        //GYRO
 #define SPI3_SCK_PIN            PB3
 #define SPI3_MISO_PIN           PB4
 #define SPI3_MOSI_PIN           PB5
@@ -143,19 +140,19 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-#define USE_SPI_DEVICE_1	//OSD
+#define USE_SPI_DEVICE_1    //OSD
 #define SPI1_SCK_PIN            PA5
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
 //-------------------------------------IIC------------------------------------
-#define USE_I2C				//MAG5883
+#define USE_I2C             //MAG5883
 #define USE_I2C_DEVICE_1
 //#define I2C_DEVICE              (I2CDEV_1)
 #define I2C1_SCL                PB8
 #define I2C1_SDA                PB9
 
-#define USE_I2C				//BMP280
+#define USE_I2C             //BMP280
 #define USE_I2C_DEVICE_2
 //#define I2C_DEVICE              (I2CDEV_2)
 #define I2C2_SCL                PB10
@@ -164,7 +161,7 @@
 //-------------------------------------FEATURES-------------------------------
 #define DEFAULT_FEATURES        (FEATURE_OSD | FEATURE_TELEMETRY )
 
-#define DEFAULT_RX_FEATURE     	FEATURE_RX_SERIAL
+#define DEFAULT_RX_FEATURE      FEATURE_RX_SERIAL
 #define SERIALRX_PROVIDER       SERIALRX_SBUS
 #define SERIALRX_UART           SERIAL_PORT_USART6
 
diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h
index 96516aa0d2..1d0d1119b0 100644
--- a/src/main/target/VRRACE/target.h
+++ b/src/main/target/VRRACE/target.h
@@ -43,10 +43,7 @@
 #define GYRO_1_ALIGN       CW270_DEG
 
 // MPU6500 interrupts
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN       PD10
-#define USE_MPU_DATA_READY_SIGNAL
 
 /*
 #define USE_BARO
diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h
index 6bc3ef1f85..e0f3833d66 100644
--- a/src/main/target/WORMFC/target.h
+++ b/src/main/target/WORMFC/target.h
@@ -62,13 +62,11 @@
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
-#define USE_EXTI
 #if defined(PIRXF4)
 #define GYRO_1_EXTI_PIN         PC5
 #else
 #define GYRO_1_EXTI_PIN         PC4
 #endif
-#define USE_MPU_DATA_READY_SIGNAL
 
 #if defined(PIRXF4)
 #define GYRO_1_CS_PIN          PC4
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 97f3b5908f..ec58991112 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -35,9 +35,6 @@
 #define BEEPER_PWM_HZ           3150 // Beeper PWM frequency in Hz
 
 // Gyro interrupt
-#define USE_EXTI
-#define USE_MPU_DATA_READY_SIGNAL
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 
 #define USE_ACC
diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h
index 8bc73bb88e..28e644f530 100644
--- a/src/main/target/YUPIF7/target.h
+++ b/src/main/target/YUPIF7/target.h
@@ -39,11 +39,8 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define USE_EXTI
-#define USE_GYRO_EXTI
 #define GYRO_1_EXTI_PIN         PC4
 
-#define USE_MPU_DATA_READY_SIGNAL
 
 // ICM 20689
 #define GYRO_1_CS_PIN           PA4
diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h
index db2fa8198a..32389acf8e 100644
--- a/src/main/target/common_defaults_post.h
+++ b/src/main/target/common_defaults_post.h
@@ -324,7 +324,7 @@
 
 // gyro hardware
 
-#if !defined(GYRO_1_SPI_INSTANCE)
+#if !defined(GYRO_1_SPI_INSTANCE) && !defined(SIMULATOR_BUILD)
 #define GYRO_1_SPI_INSTANCE     NULL
 #endif
 
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index 450aaca111..c1c18684db 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -405,11 +405,6 @@ extern uint8_t __config_end;
 #define USE_CUSTOM_DEFAULTS_ADDRESS
 #endif
 
-#if !defined(USE_EXTI)
-#undef USE_RX_SPI
-#undef USE_RANGEFINDER_HCSR04
-#endif
-
 #if defined(USE_RX_SPI) || defined (USE_SERIALRX_SRXL2)
 #define USE_RX_BIND
 #endif
diff --git a/src/test/unit/baro_bmp085_unittest.cc b/src/test/unit/baro_bmp085_unittest.cc
index 6b7c46b1df..02ab64ea37 100644
--- a/src/test/unit/baro_bmp085_unittest.cc
+++ b/src/test/unit/baro_bmp085_unittest.cc
@@ -197,9 +197,16 @@ extern "C" {
     void IOHi() {}
     void IOLo() {}
     void IOInit() {}
+    bool IORead(IO_t ) { return true; }
     void IOGetByTag() {}
+    void IORelease(IO_t) {}
     bool busBusy(const extDevice_t*, bool*) {return false;}
     void busDeviceRegister(const extDevice_t*) {}
     bool busReadRegisterBufferStart(const extDevice_t*, uint8_t, uint8_t*, uint8_t) {return true;}
     bool busWriteRegisterStart(const extDevice_t*, uint8_t, uint8_t) {return true;}
+    void EXTIHandlerInit(extiCallbackRec_t *, extiHandlerCallback *) {}
+    void EXTIConfig(IO_t, extiCallbackRec_t *, int, ioConfig_t, extiTrigger_t) {}
+    void EXTIRelease(IO_t) {}
+    void EXTIEnable(IO_t) {}
+    void EXTIDisable(IO_t) {}
 }
diff --git a/src/test/unit/scheduler_unittest.cc b/src/test/unit/scheduler_unittest.cc
index f820132d66..9d2f4bc2a7 100644
--- a/src/test/unit/scheduler_unittest.cc
+++ b/src/test/unit/scheduler_unittest.cc
@@ -18,6 +18,7 @@
 #include <stdint.h>
 
 extern "C" {
+    #include "drivers/accgyro/accgyro.h"
     #include "platform.h"
     #include "pg/pg.h"
     #include "pg/pg_ids.h"
@@ -80,6 +81,10 @@ extern "C" {
 
     // set up tasks to take a simulated representative time to execute
     bool gyroFilterReady(void) { return taskFilterReady; }
+    gyroDev_t gyro {
+        .gyroModeSPI = GYRO_EXTI_NO_INT
+    };
+    gyroDev_t *gyroActiveDev(void) { return &gyro; }
     bool pidLoopReady(void) { return taskPidReady; }
     void failsafeCheckDataFailurePeriod(void) {}
     void failsafeUpdateState(void) {}