Index: simulator/plugins/alarms/loader.py
===================================================================
diff -u -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 -r0c65b0562c34edf23a06bc224a00a7fbc340e9de
--- simulator/plugins/alarms/loader.py	(.../loader.py)	(revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34)
+++ simulator/plugins/alarms/loader.py	(.../loader.py)	(revision 0c65b0562c34edf23a06bc224a00a7fbc340e9de)
@@ -3,7 +3,7 @@
 """
 
 # shall be removed later
-from dialin.squish import denaliMessages
+# from dialin.ui import denaliMessages
 
 # Python
 import os
@@ -197,11 +197,11 @@
         mute_out = self.spnMuteTimeout.value()
         if alarm_id >= 0:
             self.set_flags()
-            denaliMessages.setAlarmStatus(self.priority,
-                                          alarm_id,
-                                          escalate,
-                                          mute_out,
-                                          self.flags)
+            # denaliMessages.setAlarmStatus(self.priority,
+            #                               alarm_id,
+            #                               escalate,
+            #                               mute_out,
+            #                               self.flags)
             self.__append_status_ids_row(alarm_id)
 
     @Slot()
@@ -212,7 +212,7 @@
         """
         alarm_id = self.spnAlarmID.value()
         if alarm_id:
-            denaliMessages.setAlarmTriggered(alarm_id)
+            # denaliMessages.setAlarmTriggered(alarm_id)
             self.__append_triggered_row(alarm_id)
 
     @Slot()
@@ -222,7 +222,7 @@
         :return: none
         """
         [alarm_id, row] = self.alarm_id()
-        denaliMessages.setAlarmCleared(alarm_id)
+        # denaliMessages.setAlarmCleared(alarm_id)
         self.tblTriggeredIDs.removeRow(row)
 
     @Slot()
@@ -232,7 +232,7 @@
         :return: none
         """
         [alarm_id, row] = self.alarm_id()
-        denaliMessages.setAlarmClearedCondition(alarm_id)
+        # denaliMessages.setAlarmClearedCondition(alarm_id)
         self.tblTriggeredIDs.item(row, self.eColID).setBackground(self.colors[AlarmPriority.ALARM_NONE])
         self.tblTriggeredIDs.item(row, self.eColID).setSelected(False)
 
Index: simulator/run.py
===================================================================
diff -u -r1779b6711f3791e8bf570e06ddb4c2e7d2a52e18 -r0c65b0562c34edf23a06bc224a00a7fbc340e9de
--- simulator/run.py	(.../run.py)	(revision 1779b6711f3791e8bf570e06ddb4c2e7d2a52e18)
+++ simulator/run.py	(.../run.py)	(revision 0c65b0562c34edf23a06bc224a00a7fbc340e9de)
@@ -3,7 +3,7 @@
 to load the main simulator loader widget
 """
 import sys
-from dialin.squish import utils
+from dialin.ui import utils
 from PySide2 import QtCore, QtWidgets
 from simulator.loader import Simulator
 from dialin.ui.hd_simulator import HDSimulator
Index: simulator/simulator/loader.py
===================================================================
diff -u -r6dd8b9b9c1553ddc0ea0315bccb4d7aad04a4d35 -r0c65b0562c34edf23a06bc224a00a7fbc340e9de
--- simulator/simulator/loader.py	(.../loader.py)	(revision 6dd8b9b9c1553ddc0ea0315bccb4d7aad04a4d35)
+++ simulator/simulator/loader.py	(.../loader.py)	(revision 0c65b0562c34edf23a06bc224a00a7fbc340e9de)
@@ -3,8 +3,8 @@
 """
 import os
 
-from dialin.squish.denaliMessages import txStates
-from dialin.squish.utils import check_can0
+from dialin.ui import TXStates
+from dialin.ui.utils import check_can0
 
 from PySide2 import QtWidgets
 from PySide2.QtCore import Qt
@@ -32,7 +32,7 @@
 
     def __init__(self):
         super().__init__(os.path.dirname(__file__), HDSimulator(console_out=True))
-        self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE
+        self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE
         if self.__check_can_bus():
             self.__init_plugins()
             self.__init_actions()