diff --git a/ohmpi/hardware_components/mux_2024_rev_0_0.py b/ohmpi/hardware_components/mux_2024_rev_0_0.py
index a6545d3ad58abe602998599c6b89df441c8b4ac2..309f345829726d7dc6b75dbd48f09e18cae213d2 100644
--- a/ohmpi/hardware_components/mux_2024_rev_0_0.py
+++ b/ohmpi/hardware_components/mux_2024_rev_0_0.py
@@ -58,8 +58,6 @@ class Mux(MuxAbstract):
         if 'cabling' not in kwargs.keys() or kwargs['cabling']=={}:
             kwargs.update({'cabling': default_mux_cabling})
         super().__init__(**kwargs)
-        if isinstance(self.ctl, dict):
-            self.ctl = None  # TODO: How to pass controller to mux board
         self.exec_logger.debug(f'configuration: {MUX_CONFIG}')
         tca_address = kwargs.pop('tca_address', None)
         tca_channel = kwargs.pop('tca_channel', 0)
diff --git a/ohmpi/hardware_components/ohmpi_card_3_15.py b/ohmpi/hardware_components/ohmpi_card_3_15.py
index 971ba36035d5bfc7f829d69765561e923ebab9bf..77e27a56cebd910823d011330881cf8a5910d89b 100644
--- a/ohmpi/hardware_components/ohmpi_card_3_15.py
+++ b/ohmpi/hardware_components/ohmpi_card_3_15.py
@@ -84,8 +84,8 @@ class Tx(TxAbstract):
         self.current_adjustable = False
         if self.ctl is None:
             self.ctl = ctl_module.Ctl()
-        elif isinstance(self.ctl, dict):
-            self.ctl = ctl_module.Ctl(**self.ctl)
+        # elif isinstance(self.ctl, dict):
+        #     self.ctl = ctl_module.Ctl(**self.ctl)
 
         # I2C connexion to MCP23008, for current injection
         self.mcp_board = MCP23008(self.ctl.bus, address=TX_CONFIG['mcp_board_address'])
@@ -207,8 +207,8 @@ class Rx(RxAbstract):
         super().__init__(**kwargs)
         if self.ctl is None:
             self.ctl = ctl_module.Ctl()
-        elif isinstance(self.ctl, dict):
-            self.ctl = ctl_module.Ctl(**self.ctl)
+        # elif isinstance(self.ctl, dict):
+        #     self.ctl = ctl_module.Ctl(**self.ctl)
         # print(f'ctl: {self.ctl}, {type(self.ctl)}')  # TODO: delete me!
         # ADS1115 for voltage measurement (MN)
         self._ads_voltage_address = 0x49