Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r06462a7f903d6ac4835125746b6b6394be4601ae -rce9145f506c3b7b970285bf2ab2e464b66f83bab
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 06462a7f903d6ac4835125746b6b6394be4601ae)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ce9145f506c3b7b970285bf2ab2e464b66f83bab)
@@ -15,6 +15,8 @@
 *
 ***************************************************************************/
 
+#include "AirTrap.h"
+#include "AirPump.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "DDInterface.h"
@@ -25,6 +27,7 @@
 #include "TubeSetInstall.h"
 #include "TxParams.h"
 #include "Valves.h"
+#include "Valve3Way.h"
 
 /**
  *  @addtogroup TDPreTreatmentMode
@@ -176,7 +179,11 @@
     switch ( currentPreTreatmentState )
     {
         case TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE:
-            signalBloodPumpHardStop();
+            // H4, H1, H19 and H5 are controlled by the Tube Set Install Service.
+            setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
+            set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+            stopSyringePump();
             break;
 
         case TD_PRE_TREATMENT_SELF_TEST_DRY_STATE:
@@ -382,13 +389,6 @@
         {
             presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
             presUFRateMlMin = ( presUFVolumeL * (F32)ML_PER_LITER ) / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION );
-            // Direct DD to generate dialysate and bypass while priming blood
-            cmdStartGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFRateMlMin,
-                                       getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), TRUE,
-                                       getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ),
-                                       bicarbConvFactor,
-                                       getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ),
-                                       getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) );
         }
 
         state = TD_PRE_TREATMENT_RECIRCULATE_STATE;