Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -r2b47dd2e7974618d8899527cdbff80fa93ebc9fa
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 96b5f969bbba7b44593c85c8ac003be0a2d87151)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 2b47dd2e7974618d8899527cdbff80fa93ebc9fa)
@@ -8,7 +8,7 @@
 * @file    ModeChemicalDisinfect.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      15-Feb-2023
+* @date    (last)      27-Feb-2023
 *
 * @author  (original)  Sean
 * @date    (original)  04-Apr-2020
@@ -130,16 +130,6 @@
 #define MIN_DRP_VOLUME_CONTROL_RPM                  350.0F                                                     ///< Minimum DRP RPM for volume control. The minimum value allowed by the pump driver is 300 RPM
 #define MAX_DRP_VOLUME_CONTROL_RPM                  1500.0F                                                    ///< Maximum DRP RPM for volume control. The maximum recommended value is 2400 RPM
 
-/// Cancellation paths
-typedef enum Cancellation_modes
-{
-    CANCELLATION_MODE_NONE = 0,                                                                                ///< Cancellation mode none.
-    CANCELLATION_MODE_BASIC,                                                                                   ///< Cancellation mode basic.
-    CANCELLATION_MODE_WATER,                                                                                   ///< Cancellation mode water.
-    CANCELLATION_MODE_CHEMICAL,                                                                                ///< Cancellation mode chemical.
-    NUM_OF_CANCELLATION_MODES                                                                                  ///< Number of cancellation modes.
-} CANCELLATION_MODE_T;
-
 /// Non-volatile write structure
 typedef struct
 {
@@ -249,7 +239,7 @@
 
     chemDisinfectState                         = DG_CHEM_DISINFECT_STATE_START;
     prevChemDisinfectState                     = DG_CHEM_DISINFECT_STATE_START;
-    stateTimer                                 = 0;
+    stateTimer                                 = getMSTimerCount();
     isThisLastDrain                            = FALSE;
     stateTrialCounter                          = 0;
     rsrvr1Status                               = NUM_OF_DG_RESERVOIR_STATUS;
@@ -273,7 +263,6 @@
     alarmDetectedPendingTrigger                = ALARM_ID_NO_ALARM;
     flushCircWaitTime                          = 0;
     flushDisinfectantWaitTime                  = 0;
-    primeAcidSteadyStateCounter                = 0;
     rsrvrFillStableTimeCounter                 = 0;
     rsrvrFillToFullStableTimeCounter           = 0;
     R1FullVolume                               = 0.0F;