Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf66a94fdd645d2146e828fd760960849d1ac05c6 -r161a56481d1a194704b63a5fd55d4c5583fa94df
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f66a94fdd645d2146e828fd760960849d1ac05c6)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 161a56481d1a194704b63a5fd55d4c5583fa94df)
@@ -137,9 +137,12 @@
 // MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE
 BOOL sendChangeTreatmentDurationResponse( BOOL accepted, U32 reason, U32 time_min, F32 volume_mL );
 
+// MSG_ID_TREATMENT_TIME_REMAINING_OVERRIDE:
+void handleTestTreatmentTimeRemainingOverrideRequest( MESSAGE_T *message );
+
 // MSG_ID_TREATMENT_PARAM_CHANGE_RANGES
 BOOL sendTreatmentParamsRangesToUI( U32 minTime, U32 maxTime, F32 minUFVol, F32 maxUFVol, U32 minDialRate, U32 maxDialRate );
-
+
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
 void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message );
 
@@ -405,15 +408,6 @@
 // MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE:
 void handleTestHDAccelBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_ACCEL_SET_CALIBRATION:
-void handleSetAccelCalibration( MESSAGE_T *message );
-
-// MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION:
-void handleSetBloodFlowCalibration( MESSAGE_T *message );
-
-// MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION:
-void handleSetDialysateFlowCalibration( MESSAGE_T *message );
-
 // MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER
 void handleTestSetTreatmentParameter( MESSAGE_T *message );
 
@@ -458,12 +452,6 @@
 // MSG_ID_SUPER_CLEAR_ALARMS_CMD
 void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_REQUEST_CALIBRATION_DATA
-void handleTestHDCalibrationDataRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_ERASE_CALIBRATION_DATA
-void handleTestEraseHDCalibrationDataRequest( MESSAGE_T *message );
-
 /**@}*/
 
 #endif