Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rd39ef6232e746a4f2d425135208602670fae60bd -re45524455c005d4fa1734efcbaf7ed0499302670
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d39ef6232e746a4f2d425135208602670fae60bd)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e45524455c005d4fa1734efcbaf7ed0499302670)
@@ -469,11 +469,6 @@
 // MSG_ID_DIAL_IN_FLOW_MEAS_OVERRIDE
 void handleTestDialInFlowMeasuredOverrideRequest( MESSAGE_T *message );
 
-#ifdef USE_FMD_FLOW_SENSOR
-// MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE
-void handleTestDialInFlowSignalStrengthOverrideRequest( MESSAGE_T *message );
-#endif
-
 // MSG_ID_DIAL_IN_PUMP_MC_MEAS_SPEED_OVERRIDE
 void handleTestDialInPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );
 
@@ -605,15 +600,9 @@
 // MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE
 void handleBloodPrimeVolumeOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE
-void handleBloodPrimeSafetyVolumeOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_HD_RINSEBACK_VOLUME_OVERRIDE
 void handleRinsebackVolumeOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_HD_RINSEBACK_SAFETY_VOLUME_OVERRIDE
-void handleRinsebackSafetyVolumeOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_HD_SWITCHES_STATUS_OVERRIDE
 void handleSetSwitchesStatusOverrideRequest( MESSAGE_T *message );