Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -rd1377c677d8a9fc576f941f413ae3b6af6f50776 -rb0d9d887e826ed5f1acd355f0c568822412bf1bb
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision d1377c677d8a9fc576f941f413ae3b6af6f50776)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision b0d9d887e826ed5f1acd355f0c568822412bf1bb)
@@ -68,31 +68,23 @@
         self.h12_air_pump_power = app[0]
         self.td_air_pump_timestamp = timestamp
 
-    def cmd_air_pump_set_state(self, state: int, power: int) -> int:
+    def cmd_air_pump_set_state(self, power: int) -> int:
         """
         Constructs and sends the air pump set state command.
-            AIR_PUMP_STATE_INIT = 0,        ///< Air Pump Initialize state
-            AIR_PUMP_STATE_OFF,             ///< Air Pump Off state
-            AIR_PUMP_STATE_ON,              ///< Air Pump On state
-            NUM_OF_AIR_PUMP_STATES,         ///< Number of air pump states
 
         Constraints:
             Must be logged into TD.
-        @param state:  integer - state value to set the air pump
         @param power:  integer - 0-255 value to set the air pump power
         @return: 1 if successful, zero otherwise
         """
 
-        idx = integer_to_bytearray(state)
         pwr = integer_to_bytearray(power)
-        payload = idx + pwr
+        payload = pwr
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
                                               message_id=MsgIds.MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("setting air pump state to" + str(state))
-
         # Send message
         received_message = self.can_interface.send(message)
 
Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r3284125031072078a4b61a83d36bff419a770918 -rb0d9d887e826ed5f1acd355f0c568822412bf1bb
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 3284125031072078a4b61a83d36bff419a770918)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision b0d9d887e826ed5f1acd355f0c568822412bf1bb)
@@ -109,8 +109,7 @@
     def cmd_pressure_sensor_override(self, pressure: float, sensor: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the measured arterial pressure override command
-            PRESSURE_SENSOR_ARTERIAL = 0            ///< Arterial blood line pressure sensor
-            PRESSURE_SENSOR_VENOUS = 1              ///< Vensous blood line pressure sensor
+    .
         Constraints:
             Must be logged into TD.
 
@@ -125,7 +124,7 @@
         prs = float_to_bytearray(pressure)
         payload = rst + prs + sen
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_TD_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
                                               message_id=MsgIds.MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r71216b08590dd4b556c10b3384dddc26c8d29a99 -rb0d9d887e826ed5f1acd355f0c568822412bf1bb
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 71216b08590dd4b556c10b3384dddc26c8d29a99)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision b0d9d887e826ed5f1acd355f0c568822412bf1bb)
@@ -24,7 +24,7 @@
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
-from leahi_dialin.utils.conversions import integer_to_bytearray
+from leahi_dialin.utils.conversions import integer_to_bytearray, short_to_bytearray
 
 
 @unique
@@ -157,7 +157,7 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_set_valve_position(self, valve: int, position: int, reset: int = NO_RESET) -> int:
+    def cmd_set_valve_position(self, valve: int, position: int) -> int:
         """
         Constructs and sends the TD valves set position for a valve
 
@@ -166,10 +166,10 @@
         @param reset: integer - 1 to reset a previous override, 0 to override
         @returns 1 if successful, zero otherwise
         """
-        reset_value = integer_to_bytearray(reset)
+
         vlv = integer_to_bytearray(valve)
-        pos = integer_to_bytearray(position)
-        payload = reset_value + pos + vlv
+        pos = short_to_bytearray(position)
+        payload = pos + vlv
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id,
                                               message_id=MsgIds.MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST.value,