Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r32df017beb715408e7eb1d2097d12f0c83638427 -rf4a79a62bdf5eb98c786daf14c32641d13ee9268
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 32df017beb715408e7eb1d2097d12f0c83638427)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f4a79a62bdf5eb98c786daf14c32641d13ee9268)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Praneeth Bunne
-* @date    (last)      10-Aug-2026
+* @author  (last)      Varshini Nagabooshanam
+* @date    (last)      11-Aug-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -39,7 +39,6 @@
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressures.h"
-#include "RotaryValve.h"
 #include "StateTxBloodPrime.h"
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
@@ -171,9 +170,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 },