Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -re250309026d33ff57fd00d74ccc05b1595610656
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
@@ -257,9 +257,6 @@
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, BP_MAX_ROTOR_SPEED_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, 0, BP_MAX_CURR_ERROR_DURATION_MS );
     initPersistentAlarm( ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, 0, BLOOD_FLOW_FAST_READ_TO_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR, 0, BLOOD_FLOW_SLOW_READ_TO_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_BP_FLOW_SENSOR_ERROR, 0, BLOOD_FLOW_COMM_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, 0, BP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
 }
 
@@ -472,30 +469,12 @@
                      fpgaBloodFlow     * bloodFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].gain +
                                          bloodFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].offset;
 
-#ifndef DISABLE_PUMP_FLOW_CHECKS
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_SENSOR_ERROR, ( flowErrorCtr != lastBloodFlowCommErrorCount ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_BP_FLOW_SENSOR_ERROR );
-    }
     if ( flowStatus != BFM_SENSOR_CONNECTED_STATUS )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE, (U32)flowStatus );
     }
     lastBloodFlowCommErrorCount = flowErrorCtr;
-#endif
 
-#ifndef DISABLE_FPGA_COUNTER_CHECKS
-    // Check for stale flow reading
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, ( fpReadCtr == lastBloodFlowFastPacketReadCtr ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR );
-    }
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR, ( spReadCtr == lastBloodFlowSlowPacketReadCtr ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR );
-    }
-#endif
-
     // Record flow read counters for next time around
     lastBloodFlowFastPacketReadCtr = fpReadCtr;
     lastBloodFlowSlowPacketReadCtr = spReadCtr;
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rccfd15568f1e3d304320c2babb2fd4bcf0413304 -re250309026d33ff57fd00d74ccc05b1595610656
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision ccfd15568f1e3d304320c2babb2fd4bcf0413304)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
@@ -257,9 +257,6 @@
 
     // Initialize persistent alarm for flow sensor signal strength too low
     initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, 0, DIALYSATE_FLOW_FAST_READ_TO_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR, 0, DIALYSATE_FLOW_SLOW_READ_TO_PERSIST );
-    initPersistentAlarm( ALARM_ID_HD_DP_FLOW_SENSOR_ERROR, 0, DIALYSATE_FLOW_COMM_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE, 0, DIP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
 }
 
@@ -443,29 +440,13 @@
                                               dialysateFlowCalRecord.hdFlowSensors[ CAL_DATA_HD_DIALYSATE_FLOW_SENSOR ].offset;
 
 #ifndef DISABLE_PUMP_FLOW_CHECKS
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DP_FLOW_SENSOR_ERROR, ( flowErrorCtr != lastDialysateFlowCommErrorCount ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_DP_FLOW_SENSOR_ERROR );
-    }
     if ( flowStatus != DFM_SENSOR_CONNECTED_STATUS )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE, (U32)flowStatus );
     }
     lastDialysateFlowCommErrorCount = flowErrorCtr;
 #endif
 
-#ifndef DISABLE_FPGA_COUNTER_CHECKS
-    // Check for stale flow reading
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, ( fpReadCtr == lastDialysateFlowFastPacketReadCtr ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR );
-    }
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR, ( spReadCtr == lastDialysateFlowSlowPacketReadCtr ) ) )
-    {
-        activateAlarmNoData( ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR );
-    }
-#endif
-
     // Record flow read counters for next time around
     lastDialysateFlowFastPacketReadCtr = fpReadCtr;
     lastDialysateFlowSlowPacketReadCtr = spReadCtr;
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r3a480399e9fd87f51a12a469cc56242ebeb93539 -re250309026d33ff57fd00d74ccc05b1595610656
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3a480399e9fd87f51a12a469cc56242ebeb93539)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
@@ -1417,14 +1417,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 +1515,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 +1583,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;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3a480399e9fd87f51a12a469cc56242ebeb93539 -re250309026d33ff57fd00d74ccc05b1595610656
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3a480399e9fd87f51a12a469cc56242ebeb93539)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
@@ -7838,4 +7838,26 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+
+/*********************************************************************//**
+* @brief
+* The handleStopHDRTCClock function handles a request to stop the RTC clock.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleStopHDRTCClock( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( 0 == message->hdr.payloadLen )
+    {
+        testSetStopRTC();
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r3a480399e9fd87f51a12a469cc56242ebeb93539 -re250309026d33ff57fd00d74ccc05b1595610656
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3a480399e9fd87f51a12a469cc56242ebeb93539)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
@@ -866,6 +866,9 @@
 // MSG_ID_HD_FANS_RPM_OVERRIDE
 void handleFansRPMOverride( MESSAGE_T *message );
 
+// MSG_ID_HD_STOP_RTC_CLOCK
+void handleStopHDRTCClock( MESSAGE_T *message );
+
 /**@}*/
 
 #endif