diff --git a/js/fc.js b/js/fc.js
index 8337a081..4599d006 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -32,7 +32,6 @@ var CONFIG,
     ADSB_VEHICLES,
     MISSION_PLANNER,
     ANALOG,
-    ARMING_CONFIG,
     FC_CONFIG,
     MISC,
     REVERSIBLE_MOTORS,
@@ -275,11 +274,6 @@ var FC = {
             battery_flags: 0
         };
 
-        ARMING_CONFIG = {
-            auto_disarm_delay: 0,
-            disarm_kill_switch: 0
-        };
-
         FC_CONFIG = {
             loopTime: 0
         };
diff --git a/js/msp/MSPCodes.js b/js/msp/MSPCodes.js
index c86be42c..dd531a23 100644
--- a/js/msp/MSPCodes.js
+++ b/js/msp/MSPCodes.js
@@ -50,8 +50,6 @@ var MSPCodes = {
     MSP_CF_SERIAL_CONFIG:       54,
     MSP_SET_CF_SERIAL_CONFIG:   55,
     MSP_SONAR:                  58,
-    MSP_ARMING_CONFIG:          61,
-    MSP_SET_ARMING_CONFIG:      62,
     MSP_DATAFLASH_SUMMARY:      70,
     MSP_DATAFLASH_READ:         71,
     MSP_DATAFLASH_ERASE:        72,
diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index 275eabd5..79005433 100644
--- a/js/msp/MSPHelper.js
+++ b/js/msp/MSPHelper.js
@@ -284,10 +284,6 @@ var mspHelper = (function (gui) {
                     PIDs[i][3] = data.getUint8(needle + 3);
                 }
                 break;
-            case MSPCodes.MSP_ARMING_CONFIG:
-                ARMING_CONFIG.auto_disarm_delay = data.getUint8(0);
-                ARMING_CONFIG.disarm_kill_switch = data.getUint8(1);
-                break;
             case MSPCodes.MSP_LOOP_TIME:
                 FC_CONFIG.loopTime = data.getInt16(0, true);
                 break;
@@ -1403,9 +1399,6 @@ var mspHelper = (function (gui) {
             case MSPCodes.MSP_SET_LOOP_TIME:
                 console.log('Looptime saved');
                 break;
-            case MSPCodes.MSP_SET_ARMING_CONFIG:
-                console.log('Arming config saved');
-                break;
             case MSPCodes.MSP_SET_RESET_CURR_PID:
                 console.log('Current PID profile reset');
                 break;
@@ -1745,10 +1738,6 @@ var mspHelper = (function (gui) {
                 buffer.push(lowByte(CONFIG.accelerometerTrims[1]));
                 buffer.push(highByte(CONFIG.accelerometerTrims[1]));
                 break;
-            case MSPCodes.MSP_SET_ARMING_CONFIG:
-                buffer.push(ARMING_CONFIG.auto_disarm_delay);
-                buffer.push(ARMING_CONFIG.disarm_kill_switch);
-                break;
             case MSPCodes.MSP_SET_LOOP_TIME:
                 buffer.push(lowByte(FC_CONFIG.loopTime));
                 buffer.push(highByte(FC_CONFIG.loopTime));
@@ -2938,10 +2927,6 @@ var mspHelper = (function (gui) {
         MSP.send_message(MSPCodes.MSPV2_BATTERY_CONFIG, false, false, callback);
     };
 
-    self.loadArmingConfig = function (callback) {
-        MSP.send_message(MSPCodes.MSP_ARMING_CONFIG, false, false, callback);
-    };
-
     self.loadRxConfig = function (callback) {
         MSP.send_message(MSPCodes.MSP_RX_CONFIG, false, false, callback);
     };
@@ -3050,10 +3035,6 @@ var mspHelper = (function (gui) {
         MSP.send_message(MSPCodes.MSP_SET_ACC_TRIM, mspHelper.crunch(MSPCodes.MSP_SET_ACC_TRIM), false, callback);
     };
 
-    self.saveArmingConfig = function (callback) {
-        MSP.send_message(MSPCodes.MSP_SET_ARMING_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_ARMING_CONFIG), false, callback);
-    };
-
     self.saveRxConfig = function (callback) {
         MSP.send_message(MSPCodes.MSP_SET_RX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RX_CONFIG), false, callback);
     };
diff --git a/tabs/configuration.js b/tabs/configuration.js
index 07d05d30..5d26f740 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -14,7 +14,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
     var loadChain = [
         mspHelper.loadFeatures,
-        mspHelper.loadArmingConfig,
         mspHelper.loadSensorAlignment,
         mspHelper.loadAdvancedConfig,
         mspHelper.loadVTXConfig,
@@ -31,7 +30,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
 
     var saveChain = [
         mspHelper.saveAccTrim,
-        mspHelper.saveArmingConfig,
         mspHelper.saveAdvancedConfig,
         mspHelper.saveVTXConfig,
         mspHelper.saveCurrentMeterConfig,
@@ -258,8 +256,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
             //UPDATE: moved to GPS tab and hidden
             //MISC.mag_declination = parseFloat($('#mag_declination').val());
 
-            ARMING_CONFIG.auto_disarm_delay = parseInt($('input[name="autodisarmdelay"]').val());
-
             MISC.battery_cells = parseInt($('#cells').val());
             MISC.voltage_source = parseInt($('#voltagesource').val());
             MISC.vbatdetectcellvoltage = parseFloat($('#celldetectvoltage').val());