Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rb36fc8801adfc9d2f402450abffe721e71f9a5e5 -r9bf209fc5813b7e806f51f408ece77174a336c9b
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision b36fc8801adfc9d2f402450abffe721e71f9a5e5)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9bf209fc5813b7e806f51f408ece77174a336c9b)
@@ -91,6 +91,7 @@
 static void resetSignalFlags( void );
 static void transitionToCartridgeInstallation( void );
 static void transitionToPatientConnection( void );
+static void verifySwitchStatus( void );
 
 static HD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void );
 static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestConsumableState( void );
@@ -179,6 +180,8 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
+    doorClosedRequired( FALSE, FALSE );
+
     return currentPreTreatmentState;
 }
 
@@ -269,27 +272,12 @@
  * @details Outputs: Alarm
  * @return none
  *************************************************************************/
-void verifySwitchStatus( void )
+static void verifySwitchStatus( void )
 {
     F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
     F32 hepRate  = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        if ( STATE_OPEN == getSwitchStatus( FRONT_DOOR ) )
-        {
-            activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
-        }
-
-        if ( STATE_OPEN == getSwitchStatus( PUMP_TRACK_SWITCH ) )
-        {
-            activateAlarmNoData( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
-        }
-    }
-
-#ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
@@ -325,14 +313,6 @@
         OPN_CLS_STATE_T frontDoor = getSwitchStatus( FRONT_DOOR );
         OPN_CLS_STATE_T pumpTrack = getSwitchStatus( PUMP_TRACK_SWITCH );
 
-#ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) )
-        {
-            frontDoor = STATE_CLOSED;
-            pumpTrack = STATE_CLOSED;
-        }
-#endif
-
         if ( STATE_CLOSED == pumpTrack )
         {
             if ( STATE_CLOSED == frontDoor )
@@ -587,6 +567,8 @@
 {
     VALVE_T valve;
 
+    doorClosedRequired( FALSE, FALSE );
+
     // Set valves
     for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
     {
@@ -616,6 +598,8 @@
     patientConnectionConfirm = FALSE;
     treatmentStartRequested = FALSE;
 
+    doorClosedRequired( FALSE, FALSE );
+
     for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
     {
         setValvePosition( valve, VALVE_POSITION_C_CLOSE );