Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r88696f3c6a5d82503064a73433d39fa000728d93 -rc62f5bfffa8e54b86c8e320bee344308b368f96d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 88696f3c6a5d82503064a73433d39fa000728d93)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c62f5bfffa8e54b86c8e320bee344308b368f96d)
@@ -303,34 +303,14 @@
 static HD_PRE_TREATMENT_MODE_STATE_T handleHomeSetupState( void )
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_HOME_SETUP_STATE;
-    VALVE_T valve;
 
-    if ( TRUE == isBloodPumpRunning() )
-    {
-        signalBloodPumpHardStop();
-    }
+    signalBloodPumpHardStop();
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
 
-    if ( TRUE == isDialInPumpRunning() )
-    {
-        signalDialInPumpHardStop();
-    }
-
-    if ( TRUE == isDialOutPumpRunning() )
-    {
-        signalDialOutPumpHardStop();
-    }
-
     if ( TRUE == getDoorState() )
     {
-        for ( valve = VDI; valve < NUM_OF_VALVES; ++valve )
-        {
-            homeValve( valve );
-        }
-
-        homeBloodPump();
-        homeDialInPump();
-        homeDialOutPump();
-
+        transitionToNoCartSelfTests();
         state = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
     }
     else
@@ -356,6 +336,7 @@
 
     if ( FALSE == getDoorState() )
     {
+        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
         state = HD_PRE_TREATMENT_HOME_SETUP_STATE;
     }