diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index b7d0cdcb0a..f028265434 100755
--- a/src/main/fc/cli.c
+++ b/src/main/fc/cli.c
@@ -162,12 +162,12 @@ static const char * const mixerNames[] = {
 
 // sync this with features_e
 static const char * const featureNames[] = {
-    "RX_PPM", "VBAT", "INFLIGHT_ACC_CAL", "RX_SERIAL", "MOTOR_STOP",
+    "RX_PPM", "", "INFLIGHT_ACC_CAL", "RX_SERIAL", "MOTOR_STOP",
     "SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE",
-    "SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM",
+    "SONAR", "TELEMETRY", "", "3D", "RX_PARALLEL_PWM",
     "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD",
-    "UNUSED", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE",
-    "SDCARD", "VTX", "RX_SPI", "SOFTSPI", "ESC_SENSOR", "ANTI_GRAVITY", "DYNAMIC_FILTER", NULL
+    "", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE",
+    "", "", "RX_SPI", "SOFTSPI", "ESC_SENSOR", "ANTI_GRAVITY", "DYNAMIC_FILTER", NULL
 };
 
 // sync this with rxFailsafeChannelMode_e
@@ -1946,7 +1946,8 @@ static void cliFeature(char *cmdline)
         for (uint32_t i = 0; ; i++) {
             if (featureNames[i] == NULL)
                 break;
-            cliPrintf(" %s", featureNames[i]);
+            if (strcmp(featureNames[i], "") != 0) //Skip unused
+                cliPrintf(" %s", featureNames[i]);
         }
         cliPrintLinefeed();
         return;
@@ -2746,7 +2747,7 @@ static void cliSet(char *cmdline)
                                     break;
                                 }
                             } else if ((valEnd == NULL) && (i == arrayLength - 1)) {
-                                array[i] = atoi(valPtr); 
+                                array[i] = atoi(valPtr);
 
                                 uint8_t *ptr = getValuePointer(val);
                                 memcpy(ptr, array, arrayLength);
diff --git a/src/main/fc/config.h b/src/main/fc/config.h
index 8a27a4e251..3a49aeaf03 100644
--- a/src/main/fc/config.h
+++ b/src/main/fc/config.h
@@ -33,7 +33,6 @@
 
 typedef enum {
     FEATURE_RX_PPM = 1 << 0,
-    //FEATURE_VBAT = 1 << 1,
     FEATURE_INFLIGHT_ACC_CAL = 1 << 2,
     FEATURE_RX_SERIAL = 1 << 3,
     FEATURE_MOTOR_STOP = 1 << 4,
@@ -43,7 +42,6 @@ typedef enum {
     FEATURE_FAILSAFE = 1 << 8,
     FEATURE_SONAR = 1 << 9,
     FEATURE_TELEMETRY = 1 << 10,
-    //FEATURE_CURRENT_METER = 1 << 11,
     FEATURE_3D = 1 << 12,
     FEATURE_RX_PARALLEL_PWM = 1 << 13,
     FEATURE_RX_MSP = 1 << 14,
@@ -51,12 +49,9 @@ typedef enum {
     FEATURE_LED_STRIP = 1 << 16,
     FEATURE_DASHBOARD = 1 << 17,
     FEATURE_OSD = 1 << 18,
-    FEATURE_BLACKBOX_UNUSED = 1 << 19,
     FEATURE_CHANNEL_FORWARDING = 1 << 20,
     FEATURE_TRANSPONDER = 1 << 21,
     FEATURE_AIRMODE = 1 << 22,
-    FEATURE_SDCARD_UNUSED = 1 << 23,
-    //FEATURE_VTX = 1 << 24,
     FEATURE_RX_SPI = 1 << 25,
     FEATURE_SOFTSPI = 1 << 26,
     FEATURE_ESC_SENSOR = 1 << 27,