Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r81872acd6f2ce222c6b9a9b93f65b7cd3665f28f -r93343475b961a704421944f94c1d322d89010170
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 81872acd6f2ce222c6b9a9b93f65b7cd3665f28f)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 93343475b961a704421944f94c1d322d89010170)
@@ -94,7 +94,7 @@
 static U32 dataPublishCounter;                                                                        ///< Flush data publish counter.
 static BOOL hasWaterCancellationBeenSet;                                                              ///< Water cancellation set/not set boolean flag.
 static F32 flushLinesVolumeL;                                                                         ///< Volume of water pumped by RO pump during flush lines state.
-static BOOL haveDrainParamsBeenInit[ NUM_OF_DG_RESERVOIRS ];                                         ///< Boolean flag to indicate whether the drain parameters have been reset or not.
+static BOOL haveDrainParamsBeenInit;                                                                  ///< Boolean flag to indicate whether the drain parameters have been reset or not.
 
 // ********** private function prototypes **********
 
@@ -132,20 +132,19 @@
 void initFlushMode( void )
 {
     // Initialize the variables
-    flushState                                  = DG_FLUSH_STATE_START;
-    prevFlushState                              = DG_FLUSH_STATE_START;
-    flushUIState                                = FLUSH_UI_STATE_NOT_RUNNING;
-    rsrvrFillStableTimeCounter                  = 0;
-    overallFlushElapsedTimeStart                = 0;
-    isThisInitialDrain                          = TRUE;
-    dataPublishCounter                          = 0;
-    rsrvr1Status                                = NUM_OF_DG_RESERVOIR_STATUS;
-    rsrvr2Status                                = NUM_OF_DG_RESERVOIR_STATUS;
-    hasWaterCancellationBeenSet                 = FALSE;
-    flushLinesVolumeL                           = 0.0;
-    haveDrainParamsBeenInit[ DG_RESERVOIR_1 ]   = FALSE;
-    haveDrainParamsBeenInit[ DG_RESERVOIR_2 ]   = FALSE;
-    stateTimerStart                             = 0;
+    flushState                   = DG_FLUSH_STATE_START;
+    prevFlushState               = DG_FLUSH_STATE_START;
+    flushUIState                 = FLUSH_UI_STATE_NOT_RUNNING;
+    rsrvrFillStableTimeCounter   = 0;
+    overallFlushElapsedTimeStart = 0;
+    isThisInitialDrain           = TRUE;
+    dataPublishCounter           = 0;
+    rsrvr1Status                 = NUM_OF_DG_RESERVOIR_STATUS;
+    rsrvr2Status                 = NUM_OF_DG_RESERVOIR_STATUS;
+    hasWaterCancellationBeenSet  = FALSE;
+    flushLinesVolumeL            = 0.0;
+    haveDrainParamsBeenInit      = FALSE;
+    stateTimerStart              = 0;
 }
 
 /*********************************************************************//**
@@ -990,28 +989,28 @@
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
 
     // If the drain parameters of the reservoir is not initialized, initialize them
-    if ( FALSE == haveDrainParamsBeenInit [ r ] )
+    if ( FALSE == haveDrainParamsBeenInit )
     {
         initDrainParameters( r );
-        haveDrainParamsBeenInit[ r ] = TRUE;
+        haveDrainParamsBeenInit = TRUE;
     }
 
     BOOL isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
         // Set the state timer in case it needs to be used for another timeout check
-        stateTimerStart              = getMSTimerCount();
-        haveDrainParamsBeenInit[ r ] = FALSE;
-        status                       = DG_RESERVOIR_REACHED_TARGET;
+        stateTimerStart         = getMSTimerCount();
+        haveDrainParamsBeenInit = FALSE;
+        status                  = DG_RESERVOIR_REACHED_TARGET;
     }
     else if ( TRUE == didTimeout( stateTimerStart, timeout ) )
     {
         // Failed to drain on time
-        prevFlushState                   = flushState;
-        haveDrainParamsBeenInit[ r ]     = FALSE;
-        alarmDetectedPendingTrigger      = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
-        status                           = DG_RESERVOIR_NOT_REACHED_TARGET;
+        prevFlushState              = flushState;
+        haveDrainParamsBeenInit     = FALSE;
+        alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT;
+        status                      = DG_RESERVOIR_NOT_REACHED_TARGET;
     }
 
     return status;