Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -ra1ba8f7e866ace5c42e0e1107eeb9414639180e3
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision a1ba8f7e866ace5c42e0e1107eeb9414639180e3)
@@ -901,13 +901,8 @@
 
     chemDisinfectFlushUIState = CHEM_DISINFECT_FLUSH_UI_STATE_COMPLETE;
 
-    writeDisinfectDataToNV( USAGE_INFO_CHEM_FLUSH );
+    stopChemicalDisinfectFlush();
 
-    if ( TRUE == disinfectNVOps.hasDisStatusBeenWrittenToNV )
-    {
-        stopChemicalDisinfectFlush();
-    }
-
     return state;
 }
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -ra1ba8f7e866ace5c42e0e1107eeb9414639180e3
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision a1ba8f7e866ace5c42e0e1107eeb9414639180e3)
@@ -636,7 +636,6 @@
         stateTimer        = getMSTimerCount();
         stateTrialCounter = 0;
         state             = DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION;
-
     }
 
     return state;