Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 -ra0e7107b30e4d6fc631784e249f59038aefeb04f
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision a0e7107b30e4d6fc631784e249f59038aefeb04f)
@@ -61,15 +61,13 @@
 
         self.valve_states_all = 0x0000
         self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED}
-        self.m7_valv = {"id": FPValveNames.M7_VALV.value, "state": DEENERGIZED}
-        self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED}
         self.p11_valv = {"id": FPValveNames.P11_VALV.value, "state": DEENERGIZED}
         self.p33_valv = {"id": FPValveNames.P33_VALV.value, "state": DEENERGIZED}
         self.p34_valv = {"id": FPValveNames.P34_VALV.value, "state": DEENERGIZED}
         self.p37_valv = {"id": FPValveNames.P37_VALV.value, "state": DEENERGIZED}
         self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED}
-        self.p20_valv = {"id": FPValveNames.P20_VALV.value, "state": DEENERGIZED}
         self.p43_valv = {"id": FPValveNames.P43_VALV.value, "state": DEENERGIZED}
+        self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED}
 
         # NOTE: The len function counts the enums with the same number only once.
         self.valve_states_enum = [0 for _ in range(len(FPValveNames))]
@@ -85,15 +83,13 @@
         """
         return [
             self.m4_valv.get("state"),
-            self.p39_valv.get("state"),
-            self.p6_valv.get("state"),
             self.p11_valv.get("state"),
             self.p33_valv.get("state"),
             self.p34_valv.get("state"),
             self.p37_valv.get("state"),
-            self.m7_valv.get("state"),
-            self.p20_valv.get("state"),
-            self.p43_valv.get("state")
+            self.p39_valv.get("state"),
+            self.p43_valv.get("state"),
+            self.p6_valv.get("state")
         ]
 
     @staticmethod
@@ -131,15 +127,13 @@
         "fp_valves_states_timestamp",
         "valve_states_all",
         "m4_valv",
-        "m7_valv",
-        "p6_valv",
         "p11_valv",
         "p33_valv",
         "p34_valv",
         "p37_valv",
         "p39_valv",
-        "p20_valv",
         "p43_valv",
+        "p6_valv",
         "valve_states_enum"
     ])
     def _handler_valves_sync(self, message, timestamp=0.0):
@@ -154,17 +148,14 @@
         self.valve_states_all = vst[0]
         # Extract each valve state from U16 valves states using bit-masking
         self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 1)
-        self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 2)
-        self.p6_valv["state"] = self._binary_to_valve_state(vst[0] & 4)
-        self.p11_valv["state"] = self._binary_to_valve_state(vst[0] & 8)
-        self.p33_valv["state"] = self._binary_to_valve_state(vst[0] & 16)
-        self.p34_valv["state"] = self._binary_to_valve_state(vst[0] & 32)
-        self.p37_valv["state"] = self._binary_to_valve_state(vst[0] & 64)
-        self.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 128)
-        self.p20_valv["state"] = self._binary_to_valve_state(vst[0] & 256)
-        self.p43_valv["state"] = self._binary_to_valve_state(vst[0] & 512)
+        self.p11_valv["state"] = self._binary_to_valve_state(vst[0] & 2)
+        self.p33_valv["state"] = self._binary_to_valve_state(vst[0] & 4)
+        self.p34_valv["state"] = self._binary_to_valve_state(vst[0] & 8)
+        self.p37_valv["state"] = self._binary_to_valve_state(vst[0] & 16)
+        self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 32)
+        self.p43_valv["state"] = self._binary_to_valve_state(vst[0] & 64)
+        self.p6_valv["state"] = self._binary_to_valve_state(vst[0] & 128)
 
-
         start = self.END_POS_VALVES_STATES
         end = start + 1
         for valve_id in self.valves_sensed_states: