Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r633861a3e472c1a288fa10a52ec0f7e7153e4dce -r981de1f5228152ec6877aceae3d66ebf5efc7101
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 633861a3e472c1a288fa10a52ec0f7e7153e4dce)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 981de1f5228152ec6877aceae3d66ebf5efc7101)
@@ -22,7 +22,6 @@
 #include "PreTreatmentRecirc.h"
 #include "Prime.h"
 #include "SelfTests.h"
-#include "SampleWater.h"
 #include "SystemCommMessages.h"
 
 /**
@@ -44,7 +43,6 @@
 
 static void resetSignalFlags( void );
 
-static HD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void );
 static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void );
 static HD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void );
 static HD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void );
@@ -63,7 +61,6 @@
 {
     currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
 
-    initSampleWater();
     initPrime();
     initSelfTests();
 
@@ -101,12 +98,14 @@
     switch ( currentPreTreatmentState )
     {
         case HD_PRE_TREATMENT_START_STATE:
-            transitionToSampleWater();
+            cmdStartDG();
+            cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
             currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
             break;
 
         case HD_PRE_TREATMENT_WATER_SAMPLE_STATE:
-            currentPreTreatmentState = handleWaterSampleState();
+            transitionToNoCartSelfTests();
+            currentPreTreatmentState = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
             break;
 
         case HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE:
@@ -220,28 +219,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleWaterSampleState function handles patient connection state
- * during pre-treatment mode.
- * @details Inputs: none
- * @details Outputs: requested mode transition to treatment mode
- * @return current state (sub-mode)
- *************************************************************************/
-static HD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void )
-{
-    HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
-
-    execSampleWater();
-
-    if ( TRUE == isSampleWaterPassed() )
-    {
-        state = HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
-    }
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSelfTestNoCartState function handles self-test with no cartridge.
  * @details Inputs: none
  * @details Outputs: home blood pump and dialysate pumps