Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r5c521c4e9f0840c337133dc041f5e61bc89353ea -rcc17b25a926126e4f5a6fa3b2a14e431bb3ae84a
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5c521c4e9f0840c337133dc041f5e61bc89353ea)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cc17b25a926126e4f5a6fa3b2a14e431bb3ae84a)
@@ -101,8 +101,6 @@
     static BOOL button_state = FALSE;
 #endif
     BOOL stop = isStopButtonPressed();
-    DG_OP_MODE_T dgOpMode = getDGOpMode();  // TODO - the DG mode & sub-mode come as a pair at interval - they MUST be kept together.
-    U32 dgSubMode = getDGSubMode();
 
 #ifndef RUN_WITHOUT_DG
     // state machine to get DG to prep a reservoir so we can start a treatment
@@ -112,12 +110,6 @@
             // temporary test code - TODO - remove later
             if ( TRUE == isDGCommunicating() )
             {
-                homeBloodPump();
-                homeDialInPump();
-                homeDialOutPump();
-                cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
-                cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-                cmdStartDG();
                 currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             }
             break;
@@ -126,27 +118,13 @@
             // TODO - test code
 #ifdef DISABLE_UI_TREATMENT_WORKFLOW
             if ( TRUE == stop )
-#endif
-            {
-                if ( DG_MODE_CIRC == dgOpMode )
-                {
-                    if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
-                    {
-#ifndef DISABLE_UI_TREATMENT_WORKFLOW
-                        if ( TRUE == treatStartReqReceived )
-                        {
-                            setStartReservoirVolume();
-                            cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
-                            requestNewOperationMode( MODE_TPAR );
-                            treatStartReqReceived = FALSE;
-                        }
 #else
-                        setStartReservoirVolume();
-                        cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
-                        requestNewOperationMode( MODE_TPAR );
+            if ( TRUE == treatStartReqReceived )
 #endif
-                    }
-                }
+            {
+                setStartReservoirVolume();
+                requestNewOperationMode( MODE_TPAR );
+                treatStartReqReceived = FALSE;
             }
             break;