Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -ra1452dc7f16d37db53930c3d73992098709d7915 -rde91824d9790638e0a17fa0278d22a3f57ed28c3
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision a1452dc7f16d37db53930c3d73992098709d7915)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
@@ -45,7 +45,7 @@
 #define TARGET_RO_PRESSURE_PSI                  130                     ///< Target pressure for RO pump.
 #define TARGET_RO_FLOW_RATE_L                   0.3                     ///< Target flow rate for RO pump.
 
-#define TARGET_FLUSH_LINES_RO_FLOW_RATE_L       0.6                     ///< Target flow rate for RO pump.
+#define TARGET_FLUSH_LINES_RO_FLOW_RATE_L       0.3                     ///< Target flow rate for RO pump.
 
 /// The time of HD lost comm before DG transition back to standby.
 #define HD_LOST_COMM_TIMEOUT_MS                 (5 * SEC_PER_MIN * MS_PER_SECOND )
@@ -109,7 +109,8 @@
     // because the initial guess in the heaters driver needs the target flow to calculate
     // the new PWMs for the main and small primary heaters
     setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
-    startPrimaryHeater();
+
+    startHeater( DG_PRIMARY_HEATER );
 }
 
 /*********************************************************************//**
@@ -213,7 +214,6 @@
     // When enough water volume has flowed to flush the lines, transition to flush water state
     if ( flushLinesVolumeL >=  getFlushLineVolume() )
     {
-        setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
         setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
         result = DG_GEN_IDLE_MODE_STATE_FLUSH_WATER;
     }