Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -r766708fceb0bdf1af8c7897df29d4f5036bfd3db
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a2bc96881a5fc3d8f779246b2abebf15a8de9384)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db)
@@ -99,8 +99,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
     if ( TRUE == stop )
@@ -115,83 +113,16 @@
             // Temporary test code - TODO - remove later
             if ( TRUE == isDGCommunicating() )
             {
-                homeBloodPump();
-                homeDialInPump();
-                homeDialOutPump();
-                cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
-                cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-                cmdStartDG();
-                currentStandbyState = STANDBY_FLUSH_DG_LINES_STATE;
-            }
-            break;
-
-        case STANDBY_FLUSH_DG_LINES_STATE:
-            // Temporary test code - TODO - remove later
-            cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-            if ( DG_MODE_CIRC == dgOpMode )
-            {
-                if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
-                {
-                    cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML );
-                }
-            }
-            else if ( DG_MODE_DRAI == dgOpMode )
-            {
-                currentStandbyState = STANDBY_DRAIN_RESERVOIR_STATE;
-            }
-            else
-            {
-                cmdStartDG();
-            }
-            break;
-
-        case STANDBY_DRAIN_RESERVOIR_STATE:
-            // Temporary test code - TODO - remove later
-            if ( DG_MODE_CIRC == dgOpMode )
-            {
-                currentStandbyState = STANDBY_WAIT_FOR_PRIME_STATE;
-            }
-            break;
-
-        case STANDBY_WAIT_FOR_PRIME_STATE:
-            // Temporary test code - TODO - remove later
-            if ( DG_MODE_CIRC == dgOpMode )
-            {
-                if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
-                {
-                    cmdStartDGFill( FILL_RESERVOIR_TO_VOLUME_ML );
-                }
-            }
-            else if ( DG_MODE_FILL == dgOpMode )
-            {
-                currentStandbyState = STANDBY_FILL_RESERVOIR_STATE;
-            }
-            break;
-
-        case STANDBY_FILL_RESERVOIR_STATE:
-            // Temporary test code - TODO - remove later
-            if ( DG_MODE_CIRC == dgOpMode )
-            {
                 currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             }
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
-            // TODO - test code
+            if ( TRUE == treatStartReqReceived )
             {
-                if ( DG_MODE_CIRC == dgOpMode )
-                {
-                    if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
-                    {
-                        if ( TRUE == treatStartReqReceived )
-                        {
-                            setStartReservoirVolume();
-                            cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
-                            requestNewOperationMode( MODE_TPAR );
-                            treatStartReqReceived = FALSE;
-                        }
-                    }
-                }
+                setStartReservoirVolume();
+                requestNewOperationMode( MODE_TPAR );
+                treatStartReqReceived = FALSE;
             }
             break;