Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r9508f34690d1de8bd091fd2e094578ce280a0f9e -r14c3c2af42b34e8407da2f2de863f245b7714dad
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9508f34690d1de8bd091fd2e094578ce280a0f9e)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 14c3c2af42b34e8407da2f2de863f245b7714dad)
@@ -602,23 +602,6 @@
 {
     DG_CHEM_DISINFECT_FLUSH_STATE_T state = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1;
 
-    // Check whether draining R1 has timed out
-    if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
-    {
-        // Do not use the standard drain status function because we are filling and draining at the same time
-        if ( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) < RSRVRS_DRAIN_TARGET_VOLUME_ML )
-        {
-            rsrvr1Status = DG_RESERVOIR_REACHED_TARGET;
-        }
-        else if ( TRUE == didTimeout( drainTimer, RSRVRS_FLUSH_DRAIN_TIMEOUT_MS ) )
-        {
-            // reservoir 1 drain timeout
-            prevChemDisinfectFlushState = state;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-            state                       = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
-        }
-    }
-
     // Check whether R2 fill has timed out
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
     {
@@ -672,23 +655,6 @@
 {
     DG_CHEM_DISINFECT_FLUSH_STATE_T state = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2;
 
-    // Check whether draining R2 has timed out
-    if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
-    {
-        // Do not use the standard drain status function because we are filling and draining at the same time
-        if ( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) < RSRVRS_DRAIN_TARGET_VOLUME_ML )
-        {
-            rsrvr2Status = DG_RESERVOIR_REACHED_TARGET;
-        }
-        else if ( TRUE == didTimeout( drainTimer, RSRVRS_FLUSH_DRAIN_TIMEOUT_MS ) )
-        {
-            // reservoir 2 drain timeout
-            prevChemDisinfectFlushState = state;
-            alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-            state                       = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;
-        }
-    }
-
     // Check whether R1 fill has timed out
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
     {