Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3479c42f6bf13fb6c565cc48ba13936e1ec22be9 -ra43e8d7086cdfa6f6208306e5b23de13ffb8a014
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3479c42f6bf13fb6c565cc48ba13936e1ec22be9)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a43e8d7086cdfa6f6208306e5b23de13ffb8a014)
@@ -48,7 +48,6 @@
 static BOOL homingInitiated;                                                                   ///< Flag indicates actuators have been homed.
 static FLUID_TYPE_T fluidType;                                                                 ///< Fluid type assigned based on user selection.
 static TREATMENT_TYPE_T modality;                                                              ///< Modality from the treatment initiation.
-static BOOL positionARequested; // Temporay
 
 // ********** private function prototypes **********
 
@@ -67,7 +66,6 @@
     currentStandbyState   = STANDBY_START_STATE;
     treatStartReqReceived = FALSE;
     homingInitiated       = FALSE;
-    positionARequested    = FALSE; //Temp
     fluidType             = FLUID_TYPE_UNKNOWN;
     modality              = TREATMENT_MODALITY_HD_SALINE_FLUID;
 }
@@ -164,78 +162,34 @@
  * @details \b Outputs: homingInitiated
  * @return next state of the standby mode state machine
  *************************************************************************/
-//static TD_STANDBY_STATE_T handleStandbyModeStartState( void )
-//{
-//    TD_STANDBY_STATE_T state = STANDBY_START_STATE;
-//
-//    if ( FALSE == homingInitiated )
-//    {
-//        VALVE_T valve;
-//        // Initiate homing for both pinch valves.
-//        for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve )
-//        {
-//            homeValve( valve, FALSE, TRUE );
-//        }
-//        homingInitiated = TRUE;
-//    }
-//    else if ( ( VALVE_STATE_IDLE == getValveState( H1_VALV ) ) &&
-//              ( VALVE_STATE_IDLE == getValveState( H19_VALV ) ) )
-//    {
-//        // After homing completes, move both pinch valves to Position A.
-//        setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
-//        setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
-//        homingInitiated = FALSE;
-//        state = STANDBY_WAIT_FOR_TREATMENT_STATE;
-//    }
-//
-//    return state;
-//}
-
 static TD_STANDBY_STATE_T handleStandbyModeStartState( void )
 {
     TD_STANDBY_STATE_T state = STANDBY_START_STATE;
 
     if ( FALSE == homingInitiated )
     {
-        BOOL h1HomeAccepted;
-        BOOL h19HomeAccepted;
-
-        h1HomeAccepted = homeValve( H1_VALV, FALSE, TRUE );
-
-        h19HomeAccepted = homeValve( H19_VALV, FALSE, TRUE );
-
-        if ( ( TRUE == h1HomeAccepted ) &&
-             ( TRUE == h19HomeAccepted ) )
+        VALVE_T valve;
+        // Initiate homing for both pinch valves.
+        for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve )
         {
-            homingInitiated = TRUE;
+            homeValve( valve, FALSE, TRUE );
         }
+        homingInitiated = TRUE;
     }
-    else if ( ( FALSE == positionARequested ) &&
-              ( VALVE_STATE_IDLE == getValveState( H1_VALV ) ) &&
+    else if ( ( VALVE_STATE_IDLE == getValveState( H1_VALV ) ) &&
               ( VALVE_STATE_IDLE == getValveState( H19_VALV ) ) )
     {
-        BOOL h1PositionAccepted;
-        BOOL h19PositionAccepted;
-
-        h1PositionAccepted = setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
-        h19PositionAccepted = setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
-
-        if ( ( TRUE == h1PositionAccepted ) &&
-             ( TRUE == h19PositionAccepted ) )
-        {
-            positionARequested = TRUE;
-        }
-    }
-    else if ( ( TRUE == positionARequested ) &&
-              ( VALVE_POSITION_A_INSERT_EJECT == getValvePosition( H1_VALV ) ) &&
-              ( VALVE_POSITION_A_INSERT_EJECT == getValvePosition( H19_VALV ) ) )
-    {
+        // After homing completes, move both pinch valves to Position A.
+        setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
+        setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
+        homingInitiated = FALSE;
         state = STANDBY_WAIT_FOR_TREATMENT_STATE;
     }
 
     return state;
 }
 
+
 /*********************************************************************//**
  * @brief
  * The handleStandbyModeWaitForTreatmentState function handles wait for