Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -re44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05 -r6190a4ad94521b74164f1e1fbd79ed359c7c27fb
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6190a4ad94521b74164f1e1fbd79ed359c7c27fb)
@@ -99,34 +99,7 @@
     // re-initialize standby mode each time we transition to standby mode
     initStandbyMode();
 
-    //deenergizeActuators();
-
-    // set initial actuator states
-    setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
-    setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
-#ifndef V_2_SYSTEM
-    setValveState( VRD1, VALVE_STATE_CLOSED );
-    setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-    setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
-#endif
-    setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
-    setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-    setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
-    setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
-    setValveState( VPI, VALVE_STATE_CLOSED );
-    setValveState( VSP, VALVE_STATE_CLOSED );
-
-    signalROPumpHardStop();
-    signalDrainPumpHardStop();
-    stopPrimaryHeater();
-    stopTrimmerHeater();
-    requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1_ACID );
-    requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
-
-    // UV off
-    turnOffUVReactor( INLET_UV_REACTOR );
-    turnOffUVReactor( OUTLET_UV_REACTOR );
+    deenergizeActuators();
 }
 
 /*********************************************************************//**
@@ -194,7 +167,7 @@
         filterFlushStartTime = getMSTimerCount();
         setValveState( VPI, VALVE_STATE_OPEN );
 #ifndef V_2_SYSTEM
-        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
 #else
         setValveState( VPD, VALVE_STATE_OPEN );  // TODO: VPD drain state is closed for V3
 #endif
@@ -294,6 +267,7 @@
     {
         stopSampleWaterRequest = FALSE;
         setValveState( VSP, VALVE_STATE_CLOSED );
+
 #ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
 #else