Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r373b25b7e3229e9203f4af6bfa491def69e2ce83 -r2468e56fbecd26da713bc78535bd727f4b105fe1
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 373b25b7e3229e9203f4af6bfa491def69e2ce83)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 2468e56fbecd26da713bc78535bd727f4b105fe1)
@@ -108,12 +108,11 @@
     // NOTE: The target flow rate should be set prior to setting the start primary heater
     // 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 );
-
-    //testSetTargetDutyCycle( 0.8 );
-
-    setHeaterTargetTemperature( DG_PRIMARY_HEATER, 39.0 );  // TODO remove this line. It comes form HD
+#ifndef DISABLE_FLOW_CONTROL_TREATMENT
+    setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+    setHeaterTargetTemperature( DG_PRIMARY_HEATER, 39.0 );  // TODO remove this line. It comes form HD this for testing only
     startHeater( DG_PRIMARY_HEATER );
+#endif
 }
 
 /*********************************************************************//**
@@ -217,8 +216,9 @@
     // 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 ); TODO remove
-        //setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+#ifndef DISABLE_FLOW_CONTROL_TREATMENT
+        setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+#endif
         result = DG_GEN_IDLE_MODE_STATE_FLUSH_WATER;
     }