Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb4114c4cd078650769bf8a0379f47989660cc6e1 -r24a98ea92563dad552889c30604d539d266b339e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b4114c4cd078650769bf8a0379f47989660cc6e1)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 24a98ea92563dad552889c30604d539d266b339e)
@@ -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;