Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rba6530b83f85452382325b97eae02d9e7e5c1cb1 -r2bb5b94fe4b43c24daf7a16af6a3cbaa681e6862
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ba6530b83f85452382325b97eae02d9e7e5c1cb1)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 2bb5b94fe4b43c24daf7a16af6a3cbaa681e6862)
@@ -534,9 +534,9 @@
 
 /*********************************************************************//**
  * @brief
- * The getValveActualEncoderPosition function handles the current and target
+ * The getValveActualEncoderPosition function handles the current
  * position
- * @details \b Inputs: currentPosition, targetPosition, positionDelta
+ * @details \b Inputs:
  * @details \b Outputs: result
  * @return none
  *************************************************************************/
@@ -554,9 +554,9 @@
 
 /*********************************************************************//**
  * @brief
- * The getValveCommandedEncoderPosition function handles the current and target
+ * The getValveCommandedEncoderPosition function handles the target
  * position
- * @details \b Inputs: currentPosition, targetPosition, positionDelta
+ * @details \b Inputs:
  * @details \b Outputs: result
  * @return none
  *************************************************************************/
@@ -576,7 +576,7 @@
  * @brief
  * The getValvePositionError function handles the current and target
  * position
- * @details \b Inputs: currentPosition, targetPosition, positionDelta
+ * @details \b Inputs: valve
  * @details \b Outputs: result
  * @return none
  *************************************************************************/
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rd466db5e5f2d865456aa12140b3d1bb56335730b -r2bb5b94fe4b43c24daf7a16af6a3cbaa681e6862
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d466db5e5f2d865456aa12140b3d1bb56335730b)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2bb5b94fe4b43c24daf7a16af6a3cbaa681e6862)
@@ -30,9 +30,6 @@
 #include "TxParams.h"
 #include "Valve3Way.h"
 #include "Valves.h"
-//#if 1
-//#include "PinchValve.h"
-//#endif
 
 
 /**
@@ -58,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
@@ -77,8 +70,6 @@
     homingInitiated       = FALSE;
     fluidType             = FLUID_TYPE_UNKNOWN;
     modality              = TREATMENT_MODALITY_HD_SALINE_FLUID;
-//    startTest             = FALSE;
-//    startPos              = FALSE;
 }
 
 /*********************************************************************//**
@@ -125,10 +116,6 @@
 //    sendDGServiceRequestToDG();
 //    sendDGUsageInfoRequestToDG();
 
-//#if 1
-//    initPinchValveDriver();
-//#endif
-
     return currentStandbyState;
 }
 
@@ -147,43 +134,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_C_CLOSE );
-//        setPinchValvePosition ( H19_VALV, VALVE_POSITION_B_OPEN );
-//    }
-//#endif
 
-
     // State machine for standby mode
     switch ( currentStandbyState )
     {