Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0eb91611fd84b139f3a35c7be0743b46e4f1bc8b -r31785f24396cebed8e10834f56fc2668783558e6
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0eb91611fd84b139f3a35c7be0743b46e4f1bc8b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 31785f24396cebed8e10834f56fc2668783558e6)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file SystemComm.c
+* @file    SystemComm.c
 *
-* @author (last) Sean Nash
-* @date (last) 14-Oct-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      09-Nov-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -1306,6 +1306,10 @@
             handleHDUsageInfoRequest( message );
             break;
 
+        case MSG_ID_HD_STOP_RTC_CLOCK:
+            handleStopHDRTCClock( message );
+            break;
+
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1417,14 +1421,6 @@
                 handleTestBloodPumpOcclusionOverrideRequest( message );
                 break;
 
-            case MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE:
-                handleTestDialysateInletPumpOcclusionOverrideRequest( message );
-                break;
-
-            case MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE:
-                handleTestDialysateOutletPumpOcclusionOverrideRequest( message );
-                break;
-
             case MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE:
                 handleTestPresOcclBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1523,14 +1519,6 @@
                 handleHDSoftwareResetRequest( message );
                 break;
 
-            case MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestBloodFlowSignalStrengthOverrideRequest( message );
-                break;
-
-            case MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestDialInFlowSignalStrengthOverrideRequest( message );
-                break;
-
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
                 handleTestBloodPumpHomeRequest( message );
                 break;
@@ -1599,18 +1587,10 @@
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE:
-                handleBloodPrimeSafetyVolumeOverrideRequest( message );
-                break;
-
             case MSG_ID_HD_RINSEBACK_VOLUME_OVERRIDE:
                 handleRinsebackVolumeOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_RINSEBACK_SAFETY_VOLUME_OVERRIDE:
-                handleRinsebackSafetyVolumeOverrideRequest( message );
-                break;
-
             case MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestSyringePumpDataBroadcastIntervalOverrideRequest( message );
                 break;