Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r05a6b11066f47ca19b203065b30f84cc2491b8f7 -re694dd566c1ed3e8b471dd7c3e9c0d1daa616ea1
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 05a6b11066f47ca19b203065b30f84cc2491b8f7)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e694dd566c1ed3e8b471dd7c3e9c0d1daa616ea1)
@@ -36,7 +36,6 @@
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressures.h"
-#include "RotaryValve.h"
 #include "StateTxBloodPrime.h"
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
@@ -159,9 +158,9 @@
     { MSG_ID_TD_AIR_TRAP_LEVEL_RAW_OVERRIDE_REQUEST,                    &testRawLevelSensorOverride },
     { MSG_ID_TD_AIR_TRAP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testAirTrapDataPublishIntervalOverride },
     { MSG_ID_TD_3_WAY_VALVE_SET_STATE_REQUEST,                          &testSet3WayValve },
-    { MSG_ID_TD_ROTARY_PINCH_VALVE_SET_POS_REQUEST,                     &testSetValve },
-    { MSG_ID_TD_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST,             &testValveStatusOverride },
-    { MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,           &testValveEncoderPositionOverride },
+    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_SET_POS_REQUEST,                     &testSetValve },
+    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST,             &testValveStatusOverride },
+    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,           &testValveEncoderPositionOverride },
     { MSG_ID_TD_VALVES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testValvesDataPublishIntervalOverride },
     { MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST,                       &testValveSetABCCmdPosition },
     { MSG_ID_TD_PINCH_VALVE_HOME_REQUEST,                               &testHomeValve },
@@ -198,6 +197,7 @@
     { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump },
     { MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST,                  &testAirPumpPowerRaiseOverride },
     { MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST,                  &testAirPumpPowerLowerOverride },
+    { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump },
     { MSG_ID_TD_BARO_MFG_CRC_OVERRIDE,                                  &testBaroPressureMFGCRCOverride },
     { MSG_ID_TD_BARO_PRESSURE_OVERRIDE,                                 &testBaroPressureOverride },
     { MSG_ID_TD_TEMPERATURE_OVERRIDE,                                   &testTemperatureOverride },