Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rdd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37 -r85814f50ffa07b1794e9b1c40d3e558554a7fb77
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision dd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 85814f50ffa07b1794e9b1c40d3e558554a7fb77)
@@ -2582,7 +2582,6 @@
  * @details Inputs: heprinBolusTargetRate
  * @details Outputs: heprinBolusTargetRate
  * @param: value : override heprinBolusTargetRate (in mL/hour)
- * @param: value : override heprinBolusTargetRate (in mL/hour)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetHeprinBolusTargetRateOverride( F32 value )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1cefdd82890709898ba4f5c8d8d93db1e650bec0 -r85814f50ffa07b1794e9b1c40d3e558554a7fb77
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1cefdd82890709898ba4f5c8d8d93db1e650bec0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 85814f50ffa07b1794e9b1c40d3e558554a7fb77)
@@ -5420,7 +5420,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleSetSwitchesStatusOverrideRequest function handles a
  * request to override the status of a switch in HD.
@@ -5452,7 +5452,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*************************************************************************
+/*********************************************************************//**
  * @brief
  * The handleTestSwitchesPublishIntervalOverrideRequest function handles a
  * request to override the the switches data publish interval.
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -redd2e65f2ee38fbfdb3d5d3dd06412758ffb1f3a -r85814f50ffa07b1794e9b1c40d3e558554a7fb77
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision edd2e65f2ee38fbfdb3d5d3dd06412758ffb1f3a)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 85814f50ffa07b1794e9b1c40d3e558554a7fb77)
@@ -222,15 +222,9 @@
 // MSG_ID_DG_TEMPERATURE_DATA:
 void handleDGTemperatureData( MESSAGE_T *message );
 
-// MSG_ID_RO_PUMP_DATA:
-void handleROPumpData( MESSAGE_T *message );
-
 // MSG_ID_DG_FLOW_SENSORS_DATA
 void handleDialysateFlowData( MESSAGE_T *message );
 
-// MSG_ID_DRAIN_PUMP_DATA:
-void handleDrainPumpData( MESSAGE_T *message );
-
 // MSG_ID_DG_PRESSURES_DATA:
 void handleDGPressuresData( MESSAGE_T *message );
 
@@ -770,9 +764,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_SET_CALIBRATION_RECORD
 void handleSetHDCalibrationRecord( MESSAGE_T *message );