Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r7166df604166f74ff5eb8667e07947d52ac39cf2 -r4a5a809459e76f558dce420dedf20f3de5b4a7a1
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 7166df604166f74ff5eb8667e07947d52ac39cf2)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4a5a809459e76f558dce420dedf20f3de5b4a7a1)
@@ -169,9 +169,6 @@
     { 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_VALVES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testValvesDataPublishIntervalOverride },
     { MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST,                       &testValveSetABCCmdPosition },
     { MSG_ID_TD_PINCH_VALVE_HOME_REQUEST,                               &testHomeValve },