diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py
index 5cb4478..f217d2c 100644
--- a/ophyd_devices/sim/sim.py
+++ b/ophyd_devices/sim/sim.py
@@ -14,7 +14,7 @@ from ophyd.sim import SynSignal
 from ophyd.utils import LimitError
 from ophyd_devices.utils.bec_scaninfo_mixin import BecScaninfoMixin
 from ophyd_devices.sim.sim_data import SimulatedDataBase, SimulatedDataCamera, SimulatedDataMonitor
-from ophyd_devices.sim.sim_additional_devices import DummyController
+from ophyd_devices.sim.sim_test_devices import DummyController
 
 from ophyd_devices.sim.sim_signals import SetableSignal, ReadOnlySignal, ComputedReadOnlySignal
 
@@ -215,7 +215,7 @@ class SimCamera(Device):
         """
         if self._stopped is True or not self._staged:
             return super().unstage()
-        self._send_data_to_bec()
+        # self._send_data_to_bec()
 
         return super().unstage()
 
diff --git a/ophyd_devices/sim/sim_additional_devices.py b/ophyd_devices/sim/sim_test_devices.py
similarity index 100%
rename from ophyd_devices/sim/sim_additional_devices.py
rename to ophyd_devices/sim/sim_test_devices.py
diff --git a/ophyd_devices/utils/bec_device_base.py b/ophyd_devices/utils/bec_device_base.py
index 49443ba..9123353 100644
--- a/ophyd_devices/utils/bec_device_base.py
+++ b/ophyd_devices/utils/bec_device_base.py
@@ -1,5 +1,5 @@
 class BECDeviceBase:
-    """Base class for BEC devices with minimal functionality."""
+    """Base class for BEC devices with zero functionality."""
 
     def __init__(self, name: str, *args, **kwargs):
         self.name = name
diff --git a/ophyd_devices/utils/bec_scaninfo_mixin.py b/ophyd_devices/utils/bec_scaninfo_mixin.py
index 3c20646..e2a47ad 100644
--- a/ophyd_devices/utils/bec_scaninfo_mixin.py
+++ b/ophyd_devices/utils/bec_scaninfo_mixin.py
@@ -102,11 +102,12 @@ class BecScaninfoMixin:
 
     def get_username(self) -> str:
         """Get username"""
-        if not self.sim_mode:
-            msg = self.device_manager.producer.get(MessageEndpoints.account())
-            if not isinstance(msg, str):
-                return os.getlogin()
-            return self.device_manager.producer.get(MessageEndpoints.account())
+        if self.sim_mode:
+            return os.getlogin()
+
+        msg = self.device_manager.producer.get(MessageEndpoints.account())
+        if msg:
+            return msg
         return os.getlogin()
 
     def load_scan_metadata(self) -> None:
diff --git a/ophyd_devices/utils/bec_utils.py b/ophyd_devices/utils/bec_utils.py
index c70cc10..94c9cf7 100644
--- a/ophyd_devices/utils/bec_utils.py
+++ b/ophyd_devices/utils/bec_utils.py
@@ -154,35 +154,6 @@ class DMMock:
         self.devices[name] = DeviceMock(name, value)
 
 
-# class MockProducer:
-#     def set_and_publish(self, endpoint: str, msgdump: str):
-#         logger.info(f"BECMessage to {endpoint} with msg dump {msgdump}")
-
-
-# class MockDeviceManager:
-#     def __init__(self) -> None:
-#         self.devices = devices()
-
-
-# class OphydObject:
-#     def __init__(self) -> None:
-#         self.name = "mock_mokev"
-#         self.obj = mokev()
-
-
-# class devices:
-#     def __init__(self):
-#         self.mokev = OphydObject()
-
-
-# class mokev:
-#     def __init__(self):
-#         self.name = "mock_mokev"
-
-#     def read(self):
-#         return {self.name: {"value": 16.0, "timestamp": time.time()}}
-
-
 class ConfigSignal(Signal):
     def __init__(
         self,