Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r08fdaaf70ab5133cbe7d019905f745074a756027 -r62aa7e7cbfb6b0dd33987a086df53481ffe4420c
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 08fdaaf70ab5133cbe7d019905f745074a756027)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 62aa7e7cbfb6b0dd33987a086df53481ffe4420c)
@@ -171,9 +171,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 },