Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -rf5ff90469cd1520361a823923ad0b58ab4a23a45 -reb02c56e88faeeda46ed62b1c0ec841dca0b9aba
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision f5ff90469cd1520361a823923ad0b58ab4a23a45)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision eb02c56e88faeeda46ed62b1c0ec841dca0b9aba)
@@ -16,17 +16,16 @@
 import struct
 
 from .modules.conductivity_sensors import FPConductivitySensors
-from .modules.constants import NO_RESET, RESET
 from .modules.flow_sensors import FPFlowSensors
+from .modules.boost_pump import FPPumps
+from .modules.flow_sensors import FPFlowSensors
 from .modules.levels import FPLevels
 from .modules.pressure_sensors import FPPressureSensors
 from .modules.temperatures import FPTemperatureSensors
 from .modules.valves import FPValves
-from .modules.water_pumps import FPPumps
 
 
 from ..common.msg_defs import MsgIds, MsgFieldPositions
-from ..common.fp_defs import FPOpModes
 from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
 from ..utils.base import AbstractSubSystem, publish, LogManager
 from ..utils.checks import check_broadcast_interval_override_ms
@@ -96,7 +95,7 @@
         self.fp_op_mode_timestamp = 0.0
         self.fp_debug_events_timestamp = 0.0
         self.ui_version_info_response_timestamp = 0.0
-        self.fp_operation_mode = FPOpModes.MODE_INIT.value
+
         self.fp_operation_sub_mode = 0
         self.fp_logged_in = False
         self.fp_set_logged_in_status(False)
@@ -179,7 +178,7 @@
         """
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_TESTER_LOGIN_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FIRST_RO_TESTER_MESSAGE.value,
                                               payload=list(map(int, map(ord, self.FP_LOGIN_PASSWORD))))
 
         self.logger.debug("Logging in...")
@@ -255,47 +254,4 @@
         self.logger.debug("Sent request to FP to reset...")
         self.fp_set_logged_in_status(False)
 
-    def cmd_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
-        """
-        Constructs and sends the measured op mode broadcast interval override command
-        Constraints:
-            Must be logged into FP.
-            Given interval must be non-zero and a multiple of the FP general task interval (50 ms).
 
-        @param ms:  integer - interval (in ms) to override with
-        @param reset:  integer - 1 to reset a previous override, 0 to override
-        @return: 1 if successful, zero otherwise
-        """
-
-        if not check_broadcast_interval_override_ms(ms):
-            return False
-
-        rst = integer_to_bytearray(reset)
-        mis = integer_to_bytearray(ms)
-        payload = rst + mis
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override op mode broadcast interval")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content...
-        if received_message is not None:
-            # self.logger.debug(received_message)
-            if reset == RESET:
-                str_res = "reset back to normal: "
-            else:
-                str_res = str(ms) + " ms: "
-            self.logger.debug("operation mode broadcast interval overridden to " + str_res +
-                              str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
-            # response payload is OK or not OK
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
-            return False
-
-