Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r9490539a39d2bfd8d40558f3c05b09b48f041e6c -rd8d7e4fb6ae3a5e9a4a2736173a2ce560cf55170
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 9490539a39d2bfd8d40558f3c05b09b48f041e6c)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision d8d7e4fb6ae3a5e9a4a2736173a2ce560cf55170)
@@ -61,6 +61,8 @@
 static BOOL rinseConcentrateLines;                                                            ///< Flag indicates to rinse concentrate lines.
 static U32 rinseConcentrateLinesTimerCtr;                                                     ///< Timer counter for rinsing concentrate lines.
 static U32 dialysateDrainStartTime;                                                           ///< Dialysate drain start time.
+static BOOL rinseConcentrateLines;                                                            ///< Flag indicates to rinse concentrate lines.
+static U32 rinseConcentrateLinesTimerCtr;                                                     ///< Timer counter for rinsing concentrate lines.
 
 // ********** private function prototypes **********
 static DG_DRAIN_STATE_T handleDrainStateStart( void );
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9490539a39d2bfd8d40558f3c05b09b48f041e6c -rd8d7e4fb6ae3a5e9a4a2736173a2ce560cf55170
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9490539a39d2bfd8d40558f3c05b09b48f041e6c)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision d8d7e4fb6ae3a5e9a4a2736173a2ce560cf55170)
@@ -609,9 +609,8 @@
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
         // If the inlet temperature and conductivity are in range, move onto the next state
-        if (TRUE)
-        //if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
-        //     ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
+        if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
+             ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -628,10 +627,9 @@
         // Couldn't get a good water sample after a couple of trials and the disinfect cycle failed
         else
         {
-            // DEBUG_DENALI
-            //alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT;
-            //prevHeatDisinfectState = state;
-            //state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT;
+            prevHeatDisinfectState = state;
+            state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
         }
     }
 
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r9490539a39d2bfd8d40558f3c05b09b48f041e6c -rd8d7e4fb6ae3a5e9a4a2736173a2ce560cf55170
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9490539a39d2bfd8d40558f3c05b09b48f041e6c)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision d8d7e4fb6ae3a5e9a4a2736173a2ce560cf55170)
@@ -129,7 +129,6 @@
 void execOperationModes( void )
 {
     DG_OP_MODE_T newMode;
-    U32 priorSubMode = currentSubMode;
 
     priorSubMode = currentSubMode;
 
@@ -148,7 +147,6 @@
     if ( currentMode != newMode )
     {
         // handle transition to new mode
-        priorSubMode = 0;
         lastMode = currentMode;
         transitionToNewOperationMode( newMode );
         currentMode = newMode;