Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rc0544e0ad0a0e83f247760f26205d79b64279ebe -rcff19e1c44fd570e139a2a3f49b5a05f0193367d
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c0544e0ad0a0e83f247760f26205d79b64279ebe)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cff19e1c44fd570e139a2a3f49b5a05f0193367d)
@@ -55,10 +55,6 @@
 
 static TD_STANDBY_STATE_T handleStandbyModeStartState( void );
 static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void );
-#if 1
-static BOOL startTest = FALSE;
-static BOOL startPos  = FALSE;
-#endif
 
 /*********************************************************************//**
  * @brief
@@ -74,8 +70,6 @@
     homingInitiated       = FALSE;
     fluidType             = FLUID_TYPE_UNKNOWN;
     modality              = TREATMENT_MODALITY_HD_SALINE_FLUID;
-    startTest             = FALSE;         // Temporary
-    startPos              = FALSE;
 }
 
 /*********************************************************************//**
@@ -122,9 +116,6 @@
 //    sendDGServiceRequestToDG();
 //    sendDGUsageInfoRequestToDG();
 
-#if 1
-    initPinchValveDriver();
-#endif
 
     return currentStandbyState;
 }
@@ -145,44 +136,7 @@
         // Ignore stop button in this mode.
     }
 
-#if 1
-    if ( TRUE == startTest )
-    {
-        startTest = FALSE;
-        startPos = TRUE;
-        homePinchValve( H1_VALV );
-        homePinchValve( H19_VALV );
-    }
-    if ( ( TRUE == isPinchValveHomed( H1_VALV ) )
-            && ( TRUE == isPinchValveHomed( H19_VALV ) ) && startPos == TRUE )
-    {
-        static U32 p = 1;
-        static U32 d = 0;
 
-        if ( ( TRUE != isPinchValveBusy( H1_VALV ) )
-                && ( TRUE != isPinchValveBusy( H19_VALV ) ) )
-        {
-            if ( ++d > 40 )
-            {
-                d = 0;
-                setPinchValvePosition( H1_VALV, (VALVE_POSITION_T)p );
-                setPinchValvePosition( H19_VALV, (VALVE_POSITION_T)p );
-                p++;
-                if ( p >= NUM_OF_VALVE_POSITIONS )
-                {
-                    p = 1;
-                }
-            }
-        }
-    }
-//    if ( TRUE == startPos )
-//    {
-//        startPos = FALSE;
-//        setPinchValvePosition( H1_VALV, VALVE_POSITION_B_OPEN );
-//        setPinchValvePosition( H19_VALV, VALVE_POSITION_B_OPEN );
-//    }
-#endif
-
     // State machine for standby mode
     switch ( currentStandbyState )
     {