diff --git a/custom_components/mikrotik_router/__init__.py b/custom_components/mikrotik_router/__init__.py
index a6c91b5..8c1661c 100644
--- a/custom_components/mikrotik_router/__init__.py
+++ b/custom_components/mikrotik_router/__init__.py
@@ -8,7 +8,6 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from .const import (
     PLATFORMS,
     DOMAIN,
-    DATA_CLIENT,
     RUN_SCRIPT_COMMAND,
 )
 from .mikrotik_controller import MikrotikControllerData
@@ -24,7 +23,6 @@ SCRIPT_SCHEMA = vol.Schema(
 async def async_setup(hass, _config):
     """Set up configured Mikrotik Controller."""
     hass.data[DOMAIN] = {}
-    hass.data[DOMAIN][DATA_CLIENT] = {}
     return True
 
 
@@ -52,7 +50,7 @@ async def async_setup_entry(hass, config_entry) -> bool:
         raise ConfigEntryNotReady()
 
     await controller.async_init()
-    hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = controller
+    hass.data[DOMAIN][config_entry.entry_id] = controller
 
     hass.config_entries.async_setup_platforms(config_entry, PLATFORMS)
     config_entry.async_on_unload(config_entry.add_update_listener(update_listener))
@@ -73,9 +71,9 @@ async def async_unload_entry(hass, config_entry) -> bool:
         config_entry, PLATFORMS
     )
     if unload_ok:
-        controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
+        controller = hass.data[DOMAIN][config_entry.entry_id]
         await controller.async_reset()
         hass.services.async_remove(DOMAIN, RUN_SCRIPT_COMMAND)
-        hass.data[DOMAIN][DATA_CLIENT].pop(config_entry.entry_id)
+        hass.data[DOMAIN].pop(config_entry.entry_id)
 
     return unload_ok
diff --git a/custom_components/mikrotik_router/binary_sensor.py b/custom_components/mikrotik_router/binary_sensor.py
index 6b8ad19..0d59c9f 100644
--- a/custom_components/mikrotik_router/binary_sensor.py
+++ b/custom_components/mikrotik_router/binary_sensor.py
@@ -17,7 +17,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from .helper import format_attribute
 from .const import (
     DOMAIN,
-    DATA_CLIENT,
     ATTRIBUTION,
     CONF_SENSOR_PPP,
     DEFAULT_SENSOR_PPP,
@@ -40,7 +39,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up device tracker for Mikrotik Router component."""
     inst = config_entry.data[CONF_NAME]
-    mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
+    mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
     sensors = {}
 
     @callback
diff --git a/custom_components/mikrotik_router/button.py b/custom_components/mikrotik_router/button.py
index 30e5144..b07e2fa 100644
--- a/custom_components/mikrotik_router/button.py
+++ b/custom_components/mikrotik_router/button.py
@@ -8,7 +8,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.restore_state import RestoreEntity
 from .helper import format_attribute
-from .const import DOMAIN, DATA_CLIENT, ATTRIBUTION
+from .const import DOMAIN, ATTRIBUTION
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -24,7 +24,7 @@ DEVICE_ATTRIBUTES_SCRIPT = [
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up buttons for Mikrotik Router component."""
     inst = config_entry.data[CONF_NAME]
-    mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
+    mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
     buttons = {}
 
     @callback
diff --git a/custom_components/mikrotik_router/const.py b/custom_components/mikrotik_router/const.py
index 28bbd97..4533181 100644
--- a/custom_components/mikrotik_router/const.py
+++ b/custom_components/mikrotik_router/const.py
@@ -10,7 +10,6 @@ PLATFORMS = [
 ]
 DOMAIN = "mikrotik_router"
 DEFAULT_NAME = "Mikrotik Router"
-DATA_CLIENT = "client"
 ATTRIBUTION = "Data provided by Mikrotik"
 
 RUN_SCRIPT_COMMAND = "run_script"
diff --git a/custom_components/mikrotik_router/device_tracker.py b/custom_components/mikrotik_router/device_tracker.py
index e7af87c..bd60698 100644
--- a/custom_components/mikrotik_router/device_tracker.py
+++ b/custom_components/mikrotik_router/device_tracker.py
@@ -20,7 +20,6 @@ from homeassistant.util.dt import get_age, utcnow
 from .helper import format_attribute, format_value
 from .const import (
     DOMAIN,
-    DATA_CLIENT,
     ATTRIBUTION,
     CONF_TRACK_HOSTS,
     DEFAULT_TRACK_HOSTS,
@@ -41,7 +40,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up device tracker for Mikrotik Router component."""
     inst = config_entry.data[CONF_NAME]
-    mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
+    mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
     trackers = {}
 
     @callback
diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py
index 2f885ee..2ee789e 100644
--- a/custom_components/mikrotik_router/sensor.py
+++ b/custom_components/mikrotik_router/sensor.py
@@ -17,7 +17,6 @@ from .const import (
     CONF_SENSOR_PORT_TRAFFIC,
     DEFAULT_SENSOR_PORT_TRAFFIC,
     DOMAIN,
-    DATA_CLIENT,
     ATTRIBUTION,
 )
 from .sensor_types import (
@@ -36,7 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up device tracker for Mikrotik Router component."""
     inst = config_entry.data[CONF_NAME]
-    mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
+    mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
     sensors = {}
 
     @callback
diff --git a/custom_components/mikrotik_router/switch.py b/custom_components/mikrotik_router/switch.py
index 815aec0..7b2b2e1 100644
--- a/custom_components/mikrotik_router/switch.py
+++ b/custom_components/mikrotik_router/switch.py
@@ -10,7 +10,7 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.restore_state import RestoreEntity
 from .helper import format_attribute
-from .const import DOMAIN, DATA_CLIENT, ATTRIBUTION
+from .const import DOMAIN, ATTRIBUTION
 from .switch_types import (
     MikrotikSwitchEntityDescription,
     SWITCH_TYPES,
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up switches for Mikrotik Router component."""
     inst = config_entry.data[CONF_NAME]
-    mikrotik_controller = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id]
+    mikrotik_controller = hass.data[DOMAIN][config_entry.entry_id]
     switches = {}
 
     @callback