Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r1a5efe97f5f39594b45797fded52cafce92afe80 -r3d131237935eb36e56e0d057a713430e31dc6405
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1a5efe97f5f39594b45797fded52cafce92afe80)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3d131237935eb36e56e0d057a713430e31dc6405)
@@ -95,34 +95,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();
 }
 
 /*********************************************************************//**