diff --git a/libraries/RC_Channel/RC_Channel.cpp b/libraries/RC_Channel/RC_Channel.cpp
index be1541f97a..88a1e297cd 100644
--- a/libraries/RC_Channel/RC_Channel.cpp
+++ b/libraries/RC_Channel/RC_Channel.cpp
@@ -38,6 +38,8 @@ extern const AP_HAL::HAL& hal;
 #include <AP_Arming/AP_Arming.h>
 #include <AP_GPS/AP_GPS.h>
 
+#define SWITCH_DEBOUNCE_TIME_MS  200
+
 const AP_Param::GroupInfo RC_Channel::var_info[] = {
     // @Param: MIN
     // @DisplayName: RC min PWM
@@ -379,15 +381,11 @@ int16_t RC_Channel::stick_mixing(const int16_t servo_in)
 //
 // support for auxillary switches:
 //
-#define MODE_SWITCH_DEBOUNCE_TIME_MS  200
-
-uint32_t RC_Channel::old_switch_positions;
-RC_Channel::modeswitch_state_t RC_Channel::mode_switch_state;
 
 void RC_Channel::reset_mode_switch()
 {
-    mode_switch_state.last_position = -1;
-    mode_switch_state.debounced_position = -1;
+    switch_state.current_position = -1;
+    switch_state.debounce_position = -1;
     read_mode_switch();
 }
 
@@ -407,32 +405,36 @@ void RC_Channel::read_mode_switch()
     else if (pulsewidth < 1750) position = 4;
     else position = 5;
 
-    if (mode_switch_state.last_position == position) {
-        // nothing to do
-        return;
-    }
-
-    const uint32_t tnow_ms = AP_HAL::millis();
-    if (position != mode_switch_state.debounced_position) {
-        mode_switch_state.debounced_position = position;
-        // store time that switch last moved
-        mode_switch_state.last_edge_time_ms = tnow_ms;
-        return;
-    }
-
-    if (tnow_ms - mode_switch_state.last_edge_time_ms < MODE_SWITCH_DEBOUNCE_TIME_MS) {
-        // still in debounce
+    if (!debounce_completed(position)) {
         return;
     }
 
     // set flight mode and simple mode setting
     mode_switch_changed(position);
+}
 
-    // set the last switch position.  This marks the
-    // transition as complete, even if the mode switch actually
-    // failed.  This prevents the vehicle changing modes
-    // unexpectedly some time later.
-    mode_switch_state.last_position = position;
+bool RC_Channel::debounce_completed(int8_t position) 
+{
+    // switch change not detected
+    if (switch_state.current_position == position) {
+        // reset debouncing
+         switch_state.debounce_position = position;
+    } else {
+        // switch change detected
+        const uint32_t tnow_ms = AP_HAL::millis();
+
+        // position not established yet
+        if (switch_state.debounce_position != position) {
+            switch_state.debounce_position = position;
+            switch_state.last_edge_time_ms = tnow_ms;
+        } else if (tnow_ms - switch_state.last_edge_time_ms >= SWITCH_DEBOUNCE_TIME_MS) {
+            // position estabilished; debounce completed
+            switch_state.current_position = position;
+            return true;
+        }
+    }
+
+    return false;
 }
 
 //
@@ -495,24 +497,13 @@ bool RC_Channel::read_aux()
     if (!read_3pos_switch(new_position)) {
         return false;
     }
-    const aux_switch_pos_t old_position = old_switch_position();
-    if (new_position == old_position) {
-        debounce.count = 0;
-        return false;
-    }
-    if (debounce.new_position != new_position) {
-        debounce.new_position = new_position;
-        debounce.count = 0;
-    }
-    // a value of 2 means we need 3 values in a row with the same
-    // value to activate
-    if (debounce.count++ < 2) {
+
+    if (!debounce_completed(new_position)) {
         return false;
     }
 
     // debounced; undertake the action:
     do_aux_function(_option, new_position);
-    set_old_switch_position(new_position);
     return true;
 }
 
diff --git a/libraries/RC_Channel/RC_Channel.h b/libraries/RC_Channel/RC_Channel.h
index 5026e7a256..3756606c87 100644
--- a/libraries/RC_Channel/RC_Channel.h
+++ b/libraries/RC_Channel/RC_Channel.h
@@ -240,37 +240,16 @@ private:
     static const uint16_t AUX_PWM_TRIGGER_LOW = 1200;
     bool read_3pos_switch(aux_switch_pos_t &ret) const WARN_IF_UNUSED;
 
-    //Documentation of Aux Switch Flags:
-    // 0 is low or false, 1 is center or true, 2 is high
-    // pairs of bits in old_switch_positions give the old switch position for an RC input.
-    static uint32_t old_switch_positions;
-
-    aux_switch_pos_t old_switch_position() const {
-        return (aux_switch_pos_t)((old_switch_positions >> (ch_in*2)) & 0x3);
-    }
-    void set_old_switch_position(const RC_Channel::aux_switch_pos_t value) {
-        old_switch_positions &= ~(0x3 << (ch_in*2));
-        old_switch_positions |= (value << (ch_in*2));
-    }
-
-    // Structure used to detect changes in the flight mode control switch
-    // static since we should only ever have one mode switch!
-    typedef struct {
-        modeswitch_pos_t debounced_position; // currently used position
-        modeswitch_pos_t last_position;      // position in previous iteration
-        uint32_t last_edge_time_ms; // system time that position was last changed
-    } modeswitch_state_t;
-    static modeswitch_state_t mode_switch_state;
-
-    // de-bounce counters
-    typedef struct {
-        uint8_t count;
-        uint8_t new_position;
-    } debounce_state_t;
-    debounce_state_t debounce;
+    // Structure used to detect and debounce switch changes
+    struct {
+        int8_t debounce_position = -1;
+        int8_t current_position = -1;
+        uint32_t last_edge_time_ms;
+    } switch_state;
 
     void reset_mode_switch();
     void read_mode_switch();
+    bool debounce_completed(int8_t position);
 };