diff --git a/bec_widgets/cli/client.py b/bec_widgets/cli/client.py
index 7dfa5cf2..ec0d269b 100644
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
@@ -50,7 +50,6 @@ _Widgets = {
     "ResumeButton": "ResumeButton",
     "RingProgressBar": "RingProgressBar",
     "ScanControl": "ScanControl",
-    "ScanMetadata": "ScanMetadata",
     "ScatterWaveform": "ScatterWaveform",
     "SignalComboBox": "SignalComboBox",
     "SignalLabel": "SignalLabel",
@@ -3062,22 +3061,6 @@ class ScanControl(RPCBase):
         """
 
 
-class ScanMetadata(RPCBase):
-    @property
-    @rpc_call
-    def enabled(self):
-        """
-        None
-        """
-
-    @enabled.setter
-    @rpc_call
-    def enabled(self):
-        """
-        None
-        """
-
-
 class ScatterCurve(RPCBase):
     """Scatter curve item for the scatter waveform widget."""
 
diff --git a/bec_widgets/utils/clickable_label.py b/bec_widgets/utils/clickable_label.py
index a88ffe98..b90b2d46 100644
--- a/bec_widgets/utils/clickable_label.py
+++ b/bec_widgets/utils/clickable_label.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from PySide6.QtGui import QMouseEvent
 from qtpy.QtCore import Signal
+from qtpy.QtGui import QMouseEvent
 from qtpy.QtWidgets import QLabel
 
 
diff --git a/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py b/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py
index 2f620f1f..742936df 100644
--- a/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py
+++ b/bec_widgets/widgets/editors/scan_metadata/scan_metadata.py
@@ -16,6 +16,9 @@ logger = bec_logger.logger
 
 
 class ScanMetadata(PydanticModelForm):
+
+    RPC = False
+
     def __init__(
         self,
         parent=None,
diff --git a/bec_widgets/widgets/services/device_browser/device_browser.py b/bec_widgets/widgets/services/device_browser/device_browser.py
index 895c89cd..ccf0906c 100644
--- a/bec_widgets/widgets/services/device_browser/device_browser.py
+++ b/bec_widgets/widgets/services/device_browser/device_browser.py
@@ -6,8 +6,7 @@ from bec_lib.callback_handler import EventType
 from bec_lib.logger import bec_logger
 from bec_lib.messages import ConfigAction
 from pyqtgraph import SignalProxy
-from PySide6.QtCore import QSize
-from qtpy.QtCore import Signal
+from qtpy.QtCore import QSize, Signal
 from qtpy.QtWidgets import QListWidget, QListWidgetItem, QVBoxLayout, QWidget
 
 from bec_widgets.cli.rpc.rpc_register import RPCRegister