Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -rb3076db63d3e6515746948fba3a4c2bf9aad9c27 -r03f1154804fd15021f0acb4b9190884f3a4f64e6
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision b3076db63d3e6515746948fba3a4c2bf9aad9c27)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 03f1154804fd15021f0acb4b9190884f3a4f64e6)
@@ -196,12 +196,12 @@
         }
 
         // Handle clearing alarm conditions
-        if ( ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) || ( requireDoorClosed != TRUE ) )
+        if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
         {
             clearAlarmCondition( ALARM_ID_HD_CARTRIDGE_DOOR_OPENED );
         }
 
-        if ( ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ) || ( requirePumpTrackLocked != TRUE ) )
+        if ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) )
         {
             clearAlarmCondition( ALARM_ID_HD_PUMP_TRACK_LATCH_OPENED );
         }