Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r14c3c2af42b34e8407da2f2de863f245b7714dad -re7456f2e25604fc6b97eeda52f00bd0c5535487d
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 14c3c2af42b34e8407da2f2de863f245b7714dad)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision e7456f2e25604fc6b97eeda52f00bd0c5535487d)
@@ -112,7 +112,6 @@
 static DG_RESERVOIR_STATUS_T rsrvr1Status;                                                                     ///< Reservoir 1 status.
 static DG_RESERVOIR_STATUS_T rsrvr2Status;                                                                     ///< Reservoir 2 status.
 static U32 waitTimer;                                                                                          ///< Wait timer for reservoir flushing.
-static U32 drainTimer;                                                                                         ///< Timer for reservoir draining during flush states
 static U32 dataPublishCounter;                                                                                 ///< Chemical disinfect flush data publish counter.
 static CANCELLATION_MODE_T cancellationMode;                                                                   ///< Cancellation mode.
 static U32 rsrvrFillToFullStableTimerCounter;                                                                  ///< Task interval counter for determining if reservoir is full
@@ -173,7 +172,6 @@
     alarmDetectedPendingTrigger                = ALARM_ID_NO_ALARM;
     chemDisinfectFlushUIState                  = CHEM_DISINFECT_FLUSH_UI_STATE_NOT_RUNNING;
     waitTimer                                  = 0;
-    drainTimer                                 = 0;
     dataPublishCounter                         = 0;
     disinfectNVOps.hasDisStatusBeenWrittenToNV = FALSE;
     hasAlarmBeenTriggered                      = FALSE;
@@ -555,7 +553,7 @@
  * UF filter for a period of time. After the flush  it transitions to the
  * next state.
  * @details Inputs: stateTimer,
- * @details Outputs: stateTimer, drainTimer, numberOfPostDisinfectRinses,
+ * @details Outputs: stateTimer, numberOfPostDisinfectRinses,
  * rsrvrFillToFullStableTimerCounter
  * @return next state of the chemical disinfect flush state machine
  *************************************************************************/
@@ -574,7 +572,6 @@
         setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
         rsrvr1Status                      = DG_RESERVOIR_ABOVE_TARGET;
         rsrvr2Status                      = DG_RESERVOIR_BELOW_TARGET;
-        drainTimer                        = getMSTimerCount();
         numberOfPostDisinfectRinses       = 0;
         rsrvrFillToFullStableTimerCounter = 0;
         stateTimer                        = getMSTimerCount();
@@ -593,8 +590,8 @@
  * if the fill times out, it transitions to water cancellation state.
  * If the drain and rinse are completed within the defined time, it
  * transitions to the next state.
- * @details Inputs: rsrvr1Status, rsrvr2Status, drainTimer, waitTimer
- * @details Outputs: stateTimer, rsrvr1Status, rsrvr2Status, drainTimer,
+ * @details Inputs: rsrvr1Status, rsrvr2Status, waitTimer
+ * @details Outputs: stateTimer, rsrvr1Status, rsrvr2Status,
  * waitTimer, prevChemDisinfectFlushState, alarmDetectedPendingTrigger
  * @return next state of the chemical disinfect flush state machine
  *************************************************************************/
@@ -628,7 +625,6 @@
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
         rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
         rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
-        drainTimer   = getMSTimerCount();
         stateTimer   = getMSTimerCount();
         state        = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2;
     }
@@ -684,7 +680,6 @@
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
-            drainTimer   = getMSTimerCount();
             stateTimer   = getMSTimerCount();
             state        = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1;
         }
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -re7456f2e25604fc6b97eeda52f00bd0c5535487d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e7456f2e25604fc6b97eeda52f00bd0c5535487d)
@@ -175,7 +175,6 @@
 static BOOL areInletWaterConditionsAlarmsActive( void );
 static BOOL areConductivityAlarmsActive( void );
 static void handleDialysateMixing( F32 measuredROFlowRate_mL_min, F32 acidMixingRatio, F32 bicarbMixingRatio );
-static void setFillInfoToRTCRAM( void );
 static BOOL isValueWithinPercentRange( F32 testValue, F32 baseValue, F32 percentFactor );
 static void publishFillModeData( void );
 
@@ -1201,24 +1200,6 @@
 
 /*********************************************************************//**
  * @brief
- * The setFillInfoToRTCRAM function writes the fill information to the RTC
- * RAM at the end of each fill. This information is used for dialysate temperature
- * control.
- * @details Inputs: fillStatus.fillFlowRateAverage
- * @details Outputs: none
- * @return none
- *************************************************************************/
-static void setFillInfoToRTCRAM( void )
-{
-    DG_HEATERS_RECORD_T record;
-
-    record.averageFillFlow = fillStatus.fillFlowRateAverageLPM;
-
-    setHeatersInfoRecord( (U08*)&record, sizeof( DG_HEATERS_RECORD_T ) );
-}
-
-/*********************************************************************//**
- * @brief
  * The publishFillModeData function publishes fill mode data
  * at the set interval.
  * @details Inputs: fillModeDataPublicationTimerCounter, fillModeDataPublishInterval
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5fc30ce9beec03fad785ce9f9e6602d4b49079fa -re7456f2e25604fc6b97eeda52f00bd0c5535487d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5fc30ce9beec03fad785ce9f9e6602d4b49079fa)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e7456f2e25604fc6b97eeda52f00bd0c5535487d)
@@ -4772,11 +4772,8 @@
  *************************************************************************/
 void handleTestDGDialinCheckIn( MESSAGE_T* message )
 {
-    BOOL status = FALSE;
-
     if ( 0 == message->hdr.payloadLen )
     {
-        status = TRUE;
         setDialinCheckInTimeStamp();
     }
 }