diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index 438ecccc3..52f903fd6 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -1112,21 +1112,6 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
         sbufWriteData(dst, rxConfig()->rcmap, RX_MAPPABLE_CHANNEL_COUNT);
         break;
 
-    case MSP_BF_CONFIG:
-        sbufWriteU8(dst, mixerConfig()->mixerMode);
-
-        sbufWriteU32(dst, featureMask());
-
-        sbufWriteU8(dst, rxConfig()->serialrx_provider);
-
-        sbufWriteU16(dst, boardAlignment()->rollDegrees);
-        sbufWriteU16(dst, boardAlignment()->pitchDegrees);
-        sbufWriteU16(dst, boardAlignment()->yawDegrees);
-
-        sbufWriteU16(dst, 0); // was currentMeterScale, see MSP_CURRENT_METER_CONFIG
-        sbufWriteU16(dst, 0); //was currentMeterOffset, see MSP_CURRENT_METER_CONFIG
-        break;
-
     case MSP_CF_SERIAL_CONFIG:
         for (int i = 0; i < SERIAL_PORT_COUNT; i++) {
             if (!serialIsPortAvailable(serialConfig()->portConfigs[i].identifier)) {
@@ -1998,25 +1983,6 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
         }
         break;
 
-    case MSP_SET_BF_CONFIG:
-#ifdef USE_QUAD_MIXER_ONLY
-        sbufReadU8(src); // mixerMode ignored
-#else
-        mixerConfigMutable()->mixerMode = sbufReadU8(src); // mixerMode
-#endif
-
-        featureClearAll();
-        featureSet(sbufReadU32(src)); // features bitmap
-
-        rxConfigMutable()->serialrx_provider = sbufReadU8(src); // serialrx_type
-
-        boardAlignmentMutable()->rollDegrees = sbufReadU16(src); // board_align_roll
-        boardAlignmentMutable()->pitchDegrees = sbufReadU16(src); // board_align_pitch
-        boardAlignmentMutable()->yawDegrees = sbufReadU16(src); // board_align_
-        sbufReadU16(src); // was currentMeterScale, see MSP_SET_CURRENT_METER_CONFIG
-        sbufReadU16(src); // was currentMeterOffset see MSP_SET_CURRENT_METER_CONFIG
-        break;
-
     case MSP_SET_CF_SERIAL_CONFIG:
         {
             uint8_t portConfigSize = sizeof(uint8_t) + sizeof(uint16_t) + (sizeof(uint8_t) * 4);
diff --git a/src/main/interface/msp_protocol.h b/src/main/interface/msp_protocol.h
index aca6dc595..2a66f1774 100644
--- a/src/main/interface/msp_protocol.h
+++ b/src/main/interface/msp_protocol.h
@@ -161,10 +161,9 @@
 #define MSP_RX_MAP                      64 //out message get channel map (also returns number of channels total)
 #define MSP_SET_RX_MAP                  65 //in message set rx map, numchannels to set comes from MSP_RX_MAP
 
-// FIXME - Provided for backwards compatibility with configurator code until configurator is updated.
 // DEPRECATED - DO NOT USE "MSP_BF_CONFIG" and MSP_SET_BF_CONFIG.  In Cleanflight, isolated commands already exist and should be used instead.
-#define MSP_BF_CONFIG                   66 //out message baseflight-specific settings that aren't covered elsewhere
-#define MSP_SET_BF_CONFIG               67 //in message baseflight-specific settings save
+// DEPRECATED - #define MSP_BF_CONFIG                   66 //out message baseflight-specific settings that aren't covered elsewhere
+// DEPRECATED - #define MSP_SET_BF_CONFIG               67 //in message baseflight-specific settings save
 
 #define MSP_REBOOT                      68 //in message reboot settings