diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
index 7022da6ecd..ef393b2778 100755
--- a/src/main/flight/mixer.c
+++ b/src/main/flight/mixer.c
@@ -101,7 +101,6 @@ static const motorMixer_t mixerTricopter[] = {
     { 1.0f,  1.0f, -0.666667f,  0.0f },     // LEFT
 };
 
-#ifndef DISABLE_UNCOMMON_MIXERS
 static const motorMixer_t mixerQuadP[] = {
     { 1.0f,  0.0f,  1.0f, -1.0f },          // REAR
     { 1.0f, -1.0f,  0.0f,  1.0f },          // RIGHT
@@ -109,6 +108,7 @@ static const motorMixer_t mixerQuadP[] = {
     { 1.0f,  0.0f, -1.0f, -1.0f },          // FRONT
 };
 
+#ifndef DISABLE_UNCOMMON_MIXERS
 static const motorMixer_t mixerVtail4[] = {
     { 1.0f,  -0.58f,  0.58f, 1.0f },        // REAR_R
     { 1.0f,  -0.46f, -0.39f, -0.5f },       // FRONT_R
@@ -215,11 +215,7 @@ const mixer_t mixers[] = {
     // motors, use servo, motor mixer
     { 0, false, NULL, true },                // entry 0
     { 3, true,  mixerTricopter, true },      // MIXER_TRI
-    #if !defined(DISABLE_UNCOMMON_MIXERS)
-        { 4, false, mixerQuadP, true },      // MIXER_QUADP
-    #else
-        { 0, false, NULL, false },           // MIXER_QUADP
-    #endif
+    { 4, false, mixerQuadP, true },          // MIXER_QUADP
     { 4, false, mixerQuadX, true },          // MIXER_QUADX
 
     { 0, false, NULL, false },               // MIXER_BICOPTER
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index d9ee608a87..0a9ea03304 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -1691,6 +1691,7 @@ static void cliDump(char *cmdline)
             cliPrintf("%s\r\n", ftoa(yaw, buf));
         }
 
+#ifdef USE_SERVOS
         // print custom servo mixer if exists
         cliPrintf("smix reset\r\n");
 
@@ -1710,6 +1711,7 @@ static void cliDump(char *cmdline)
                 masterConfig.customServoMixer[i].box
             );
         }
+#endif // USE_SERVOS
 
 #endif
 
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index e64d31d657..1e3390c711 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -146,11 +146,12 @@
 #undef TELEMETRY_SMARTPORT
 
 #ifdef CC3D_OPBL
-#define USE_QUAD_MIXER_ONLY
 #undef USE_SERVOS
+#undef BLACKBOX
 #undef TELEMETRY
 #undef TELEMETRY_LTM
 #undef SERIAL_RX
+#undef SPEKTRUM_BIND
 #undef USE_SERIAL_4WAY_BLHELI_INTERFACE
 #endif