Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r5016cb7de01291976a89a43b03ab755b534f0889 -rac05209d7b6c65b22359754eced5ad2672d3092a
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 5016cb7de01291976a89a43b03ab755b534f0889)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ac05209d7b6c65b22359754eced5ad2672d3092a)
@@ -30,10 +30,6 @@
 #ifdef EMC_TEST_BUILD     // TODO - test code
 #include "FPGA.h"
 #endif
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "Timers.h"
-    static U32 start;
-#endif
 
 /**
  *  @addtogroup HDStandbyMode
@@ -87,9 +83,6 @@
     setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#ifdef RM46_EVAL_BOARD_TARGET
-    start = getMSTimerCount();
-#endif
 }
 
 /*********************************************************************//**
@@ -185,27 +178,18 @@
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
             // 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 );
-#endif
                     }
                 }
             }
@@ -304,13 +288,6 @@
     }
 #endif
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    if ( TRUE == didTimeout( start, 5000U ) )
-    {
-        requestNewOperationMode( MODE_TPAR );
-    }
-#endif
-
     return currentStandbyState;
 }