diff --git a/src/main/pg/rx_spi.c b/src/main/pg/rx_spi.c
index f9b6760fc..0f18b8ae4 100644
--- a/src/main/pg/rx_spi.c
+++ b/src/main/pg/rx_spi.c
@@ -43,7 +43,7 @@ void pgResetFn_rxSpiConfig(rxSpiConfig_t *rxSpiConfig)
 
     rxSpiConfig->extiIoTag = IO_TAG(RX_SPI_EXTI_PIN);
 
-    rxSpiConfig->bindIoTag = IO_TAG(BINDPLUG_PIN);
+    rxSpiConfig->bindIoTag = IO_TAG(RX_SPI_BIND_PIN);
     rxSpiConfig->ledIoTag = IO_TAG(RX_SPI_LED_PIN);
 #ifdef RX_SPI_LED_INVERTED
     rxSpiConfig->ledInversion = true;
diff --git a/src/main/rx/rx_spi_common.c b/src/main/rx/rx_spi_common.c
index 0672f3c81..425dc7199 100644
--- a/src/main/rx/rx_spi_common.c
+++ b/src/main/rx/rx_spi_common.c
@@ -51,7 +51,7 @@ void rxSpiCommonIOInit(const rxSpiConfig_t *rxSpiConfig)
 
     if (rxSpiConfig->bindIoTag) {
         bindPin = IOGetByTag(rxSpiConfig->bindIoTag);
-        IOInit(bindPin, OWNER_RX_BIND, 0);
+        IOInit(bindPin, OWNER_RX_SPI_BIND, 0);
         IOConfigGPIO(bindPin, IOCFG_IPU);
         lastBindPinStatus = IORead(bindPin);
     } else {
diff --git a/src/main/target/CRAZYBEEF3FR/target.h b/src/main/target/CRAZYBEEF3FR/target.h
index dc25e1d0f..3b8819bcd 100644
--- a/src/main/target/CRAZYBEEF3FR/target.h
+++ b/src/main/target/CRAZYBEEF3FR/target.h
@@ -117,7 +117,7 @@
 #define RX_SPI_INSTANCE         SPI2
 #define RX_NSS_PIN              SPI2_NSS_PIN
 #define RX_SPI_EXTI_PIN         PA8
-#define BINDPLUG_PIN            PA9
+#define RX_SPI_BIND_PIN         PA9
 #define RX_SPI_LED_PIN          PA10
 #define DEFAULT_FEATURES        (FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_MOTOR_STOP)
 #elif defined(CRAZYBEEF3DX)
@@ -138,7 +138,7 @@
 #define RX_NSS_PIN              SPI2_NSS_PIN
 #define RX_SPI_EXTI_PIN         PA8
 #define RX_SPI_LED_PIN          PA10
-#define BINDPLUG_PIN            PA9
+#define RX_SPI_BIND_PIN         PA9
 #define DEFAULT_FEATURES        (FEATURE_TELEMETRY | FEATURE_OSD | FEATURE_MOTOR_STOP)
 #endif
 
diff --git a/src/main/target/EACHIF3/target.h b/src/main/target/EACHIF3/target.h
index 6b4149326..338af30e2 100644
--- a/src/main/target/EACHIF3/target.h
+++ b/src/main/target/EACHIF3/target.h
@@ -63,7 +63,7 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 #define RX_NSS_PIN              SPI2_NSS_PIN
-#define BINDPLUG_PIN            PA1
+#define RX_SPI_BIND_PIN         PA1
 
 
 #define USE_I2C
diff --git a/src/main/target/MATEKF411RX/target.h b/src/main/target/MATEKF411RX/target.h
index 541e3e89e..a6a3b38e7 100644
--- a/src/main/target/MATEKF411RX/target.h
+++ b/src/main/target/MATEKF411RX/target.h
@@ -92,7 +92,7 @@
 #define USE_RX_SPI
 #define RX_SPI_INSTANCE         SPI3
 
-#define BINDPLUG_PIN            PB2
+#define RX_SPI_BIND_PIN         PB2
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_SPI
 
@@ -106,7 +106,6 @@
 #define RX_SPI_LED_PIN          PB9
 
 #elif defined(CRAZYBEEF4FR)
-#define RX_CC2500_SPI_DISABLE_CHIP_DETECTION
 #define RX_SPI_EXTI_PIN             PC14
 #define RX_SPI_LED_PIN              PB9
 #define USE_RX_FRSKY_SPI_D
diff --git a/src/main/target/MIDELICF3/target.h b/src/main/target/MIDELICF3/target.h
index 5c34ea67a..5bbe99503 100644
--- a/src/main/target/MIDELICF3/target.h
+++ b/src/main/target/MIDELICF3/target.h
@@ -117,8 +117,7 @@
 
 #define RX_CC2500_SPI_ANT_SEL_PIN PB2
 
-
-#define BINDPLUG_PIN             PC13
+#define RX_SPI_BIND_PIN          PC13
 
 #define USE_ESCSERIAL
 #define ESCSERIAL_TIMER_TX_PIN   PB9 // Motor 6, can't use escserial for hexa
diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h
index c5abfcea4..11ea4d7c1 100644
--- a/src/main/target/common_defaults_post.h
+++ b/src/main/target/common_defaults_post.h
@@ -301,6 +301,10 @@
 #define RX_SPI_EXTI_PIN NONE
 #endif
 
+#if !defined(RX_SPI_BIND_PIN)
+#define RX_SPI_BIND_PIN NONE
+#endif
+
 #if defined(USE_RX_CC2500)
 #if !defined(RX_CC2500_SPI_TX_EN_PIN)
 #define RX_CC2500_SPI_TX_EN_PIN NONE
diff --git a/unified_targets/configs/CRAZYBEEF4FR.config b/unified_targets/configs/CRAZYBEEF4FR.config
index f890b2256..0e7656550 100644
--- a/unified_targets/configs/CRAZYBEEF4FR.config
+++ b/unified_targets/configs/CRAZYBEEF4FR.config
@@ -1,4 +1,4 @@
-# Betaflight / STM32F411 (S411) 4.0.0 Mar  2 2019 / 21:03:37 (48d32d8b1) MSP API: 1.41
+# Betaflight / STM32F411 (S411) 4.1.0 Jul  8 2019 / 00:24:09 (5e6e1af0b) MSP API: 1.42
 
 board_name CRAZYBEEF4FR
 manufacturer_id HAMO
@@ -19,7 +19,6 @@ resource SERIAL_TX 2 A02
 resource SERIAL_RX 1 A10
 resource SERIAL_RX 2 A03
 resource LED 1 C13
-resource RX_BIND_PLUG 1 B02
 resource SPI_SCK 1 A05
 resource SPI_SCK 2 B13
 resource SPI_SCK 3 B03
@@ -84,8 +83,6 @@ feature RX_SPI
 # master
 set rx_spi_protocol = FRSKY_X
 set rx_spi_bus = 3
-set rx_spi_led_inversion = OFF
-set adc_device = 1
 set motor_pwm_protocol = DSHOT600
 set current_meter = ADC
 set battery_meter = ADC
@@ -94,7 +91,6 @@ set beeper_inversion = ON
 set beeper_od = OFF
 set system_hse_mhz = 8
 set max7456_spi_bus = 2
-set cc2500_spi_chip_detect = ON
 set gyro_1_bustype = SPI
 set gyro_1_spibus = 1
 set gyro_1_sensor_align = CW90
diff --git a/unified_targets/configs/MATEKF411RX.config b/unified_targets/configs/MATEKF411RX.config
index f1d10ca96..5635a3ad6 100644
--- a/unified_targets/configs/MATEKF411RX.config
+++ b/unified_targets/configs/MATEKF411RX.config
@@ -19,7 +19,6 @@ resource SERIAL_TX 2 A02
 resource SERIAL_RX 1 A10
 resource SERIAL_RX 2 A03
 resource LED 1 C13
-resource RX_BIND 1 B02
 resource SPI_SCK 1 A05
 resource SPI_SCK 2 B13
 resource SPI_SCK 3 B03