Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r8a9d78a8c1648c3c7ee43fc9ce81eaf4443b7b52 -rcfcb9246fdd7c4487b5c74aabeef70d50cc30d9b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8a9d78a8c1648c3c7ee43fc9ce81eaf4443b7b52)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision cfcb9246fdd7c4487b5c74aabeef70d50cc30d9b)
@@ -8,7 +8,7 @@
 * @file    ModeFill.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      24-Jul-2023
+* @date    (last)      09-Aug-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -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 );
 
@@ -876,8 +875,8 @@
         integratedVolumeML.data += getMeasuredROFlowRateWithConcPumpsLPM() * ML_PER_LITER * FLOW_INTEGRATOR;
     }
 
-    usedAcidVolumeML.data   += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
-    usedBicarbVolumeML.data += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR;
+    usedAcidVolumeML.data   += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
+    usedBicarbVolumeML.data += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR;
     acidConductivityTotal   += acidConduSPerCM;
     bicarbConductivityTotal += bicarbConduSPerCM;
     conductivitySampleCount++;
@@ -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 -r3a2b4f4cfc9681ea855365ad7bc00bea47e2a3e3 -rcfcb9246fdd7c4487b5c74aabeef70d50cc30d9b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3a2b4f4cfc9681ea855365ad7bc00bea47e2a3e3)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cfcb9246fdd7c4487b5c74aabeef70d50cc30d9b)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      03-Aug-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      09-Aug-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -4773,11 +4773,8 @@
  *************************************************************************/
 void handleTestDGDialinCheckIn( MESSAGE_T* message )
 {
-    BOOL status = FALSE;
-
     if ( 0 == message->hdr.payloadLen )
     {
-        status = TRUE;
         setDialinCheckInTimeStamp();
     }
 }