Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r98f34c2ab63d51a1bf248db454ebc04e184d4748 -rc282822f36836a8127f447c8ac5b8a50e851be63
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 98f34c2ab63d51a1bf248db454ebc04e184d4748)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c282822f36836a8127f447c8ac5b8a50e851be63)
@@ -1187,10 +1187,6 @@
             handleUIUserConfirmTreatmentParameters( message );
             break;
 
-        case MSG_ID_UI_TREATMENT_END_REQUEST:
-            handleUIUserEndTreatmentRequest( message );
-            break;
-
         case MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST:
             handleChangePressureLimitsRequest( message );
             break;
@@ -1373,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;
@@ -1451,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;