Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rf9faa852e6768e386171a1ca3b8337f88cdc3e82 -rd16609f215cf5ba8e08b902cf12a9492b40ed2cc
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f9faa852e6768e386171a1ca3b8337f88cdc3e82)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d16609f215cf5ba8e08b902cf12a9492b40ed2cc)
@@ -1369,18 +1369,6 @@
                 handleTestHDAccelBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_ACCEL_SET_CALIBRATION:
-                handleSetAccelCalibration( message );
-                break;
-
-            case MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION:
-                handleSetBloodFlowCalibration( message );
-                break;
-
-            case MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION:
-                handleSetDialysateFlowCalibration( message );
-                break;
-
             case MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE:
                 handleTestDialOutFlowSetPointOverrideRequest( message );
                 break;
@@ -1447,14 +1435,6 @@
                 handleTestSuperClearAlarmsRequest( message );
                 break;
 
-            case MSG_ID_HD_REQUEST_CALIBRATION_DATA:
-                handleTestHDCalibrationDataRequest( message );
-                break;
-
-            case MSG_ID_HD_ERASE_CALIBRATION_DATA:
-                handleTestEraseHDCalibrationDataRequest( message );
-                break;
-
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;