Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r3d977e037c170a3ad8870738215830d41713b00b -receb190a5d66fdbee779478ac8bb50a846ed9241
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 3d977e037c170a3ad8870738215830d41713b00b)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
@@ -194,7 +194,7 @@
  *************************************************************************/
 U32 transitionToChemicalDisinfectFlushMode( void )
 {
-    deenergizeActuators();
+    deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initChemicalDisinfectFlushMode();
 
@@ -705,8 +705,8 @@
             rsrvr1Status    = DG_RESERVOIR_ABOVE_TARGET;
             // Turn off CP1 and CP2 and ROP
             signalROPumpHardStop();
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
             //Turn off UV reactors
             turnOffUVReactor( INLET_UV_REACTOR );
             turnOffUVReactor( OUTLET_UV_REACTOR );
@@ -762,7 +762,7 @@
     if ( CANCELLATION_MODE_NONE == cancellationMode )
     {
         // Stop all the actuators first then decide who should run next
-        deenergizeActuators();
+        deenergizeActuators( NO_PARK_CONC_PUMPS );
 
         cancellationMode = CANCELLATION_MODE_WATER;
         rsrvr1Status     = DG_RESERVOIR_ABOVE_TARGET;
@@ -1056,18 +1056,18 @@
  * @details Outputs: disinfectFlushNVOps
  * @return: none
  *************************************************************************/
-// TODO: is this necessary?
 static void writeDisinfectFlushDataToNV( void )
 {
-    if ( FALSE == disinfectFlushNVOps.hasDisFlushCompleteDateBeenWrittenToNV )
+    // TODO update in the next branch
+    /*if ( FALSE == disinfectFlushNVOps.hasDisFlushCompleteDateBeenWrittenToNV )
     {
         disinfectFlushNVOps.hasDisFlushCompleteDateBeenWrittenToNV = setDisinfectStatus( TRUE );
     }
 
     if ( FALSE == disinfectFlushNVOps.hasDisFlushStatusBeenWrittenToNV )
     {
         disinfectFlushNVOps.hasDisFlushStatusBeenWrittenToNV = setLastDisinfectDate( USAGE_INFO_CHEMICAL_DISINFECT, getRTCTimestamp() );
-    }
+    }*/
 }
 
 /**@}*/