diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py
index f3851a7..f2d3012 100644
--- a/custom_components/mikrotik_router/sensor.py
+++ b/custom_components/mikrotik_router/sensor.py
@@ -39,7 +39,7 @@ async def async_setup_entry(
     dispatcher = {
         "MikrotikSensor": MikrotikSensor,
         "MikrotikInterfaceTrafficSensor": MikrotikInterfaceTrafficSensor,
-        "MikrotikClientTrafficSensor": MikrotikClientTrafficSensor,
+        # "MikrotikClientTrafficSensor": MikrotikClientTrafficSensor,
     }
     await async_add_entities(hass, config_entry, dispatcher)
 
@@ -109,27 +109,27 @@ class MikrotikInterfaceTrafficSensor(MikrotikSensor):
         return attributes
 
 
-# ---------------------------
-#   MikrotikClientTrafficSensor
-# ---------------------------
-class MikrotikClientTrafficSensor(MikrotikSensor):
-    """Define an Mikrotik MikrotikClientTrafficSensor sensor."""
-
-    @property
-    def name(self) -> str:
-        """Return the name."""
-        return f"{self.entity_description.name}"
-
-    @property
-    def available(self) -> bool:
-        """Return if controller and accounting feature in Mikrotik is available.
-        Additional check for lan-tx/rx sensors
-        """
-        if self.entity_description.data_attribute in ["lan-tx", "lan-rx"]:
-            return (
-                self.coordinator.connected()
-                and self._data["available"]
-                and self._data["local_accounting"]
-            )
-        else:
-            return self.coordinator.connected() and self._data["available"]
+# # ---------------------------
+# #   MikrotikClientTrafficSensor
+# # ---------------------------
+# class MikrotikClientTrafficSensor(MikrotikSensor):
+#     """Define an Mikrotik MikrotikClientTrafficSensor sensor."""
+#
+#     @property
+#     def name(self) -> str:
+#         """Return the name."""
+#         return f"{self.entity_description.name}"
+#
+#     # @property
+#     # def available(self) -> bool:
+#     #     """Return if controller and accounting feature in Mikrotik is available.
+#     #     Additional check for lan-tx/rx sensors
+#     #     """
+#     #     if self.entity_description.data_attribute in ["lan-tx", "lan-rx"]:
+#     #         return (
+#     #             self.coordinator.connected()
+#     #             and self._data["available"]
+#     #             and self._data["local_accounting"]
+#     #         )
+#     #     else:
+#     #         return self.coordinator.connected() and self._data["available"]
diff --git a/custom_components/mikrotik_router/sensor_types.py b/custom_components/mikrotik_router/sensor_types.py
index 87bf227..fc45aad 100644
--- a/custom_components/mikrotik_router/sensor_types.py
+++ b/custom_components/mikrotik_router/sensor_types.py
@@ -503,7 +503,7 @@ SENSOR_TYPES: tuple[MikrotikSensorEntityDescription, ...] = (
         data_uid="",
         data_reference="mac-address",
         data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
-        func="MikrotikClientTrafficSensor",
+        # func="MikrotikClientTrafficSensor",
     ),
     MikrotikSensorEntityDescription(
         key="client_traffic_lan_rx",
@@ -524,7 +524,7 @@ SENSOR_TYPES: tuple[MikrotikSensorEntityDescription, ...] = (
         data_uid="",
         data_reference="mac-address",
         data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
-        func="MikrotikClientTrafficSensor",
+        # func="MikrotikClientTrafficSensor",
     ),
     MikrotikSensorEntityDescription(
         key="client_traffic_wan_tx",
@@ -545,7 +545,7 @@ SENSOR_TYPES: tuple[MikrotikSensorEntityDescription, ...] = (
         data_uid="",
         data_reference="mac-address",
         data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
-        func="MikrotikClientTrafficSensor",
+        # func="MikrotikClientTrafficSensor",
     ),
     MikrotikSensorEntityDescription(
         key="client_traffic_wan_rx",
@@ -566,7 +566,7 @@ SENSOR_TYPES: tuple[MikrotikSensorEntityDescription, ...] = (
         data_uid="",
         data_reference="mac-address",
         data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
-        func="MikrotikClientTrafficSensor",
+        # func="MikrotikClientTrafficSensor",
     ),
     MikrotikSensorEntityDescription(
         key="client_traffic_tx",
@@ -587,7 +587,7 @@ SENSOR_TYPES: tuple[MikrotikSensorEntityDescription, ...] = (
         data_uid="",
         data_reference="mac-address",
         data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
-        func="MikrotikClientTrafficSensor",
+        # func="MikrotikClientTrafficSensor",
     ),
     MikrotikSensorEntityDescription(
         key="client_traffic_rx",
@@ -608,7 +608,7 @@ SENSOR_TYPES: tuple[MikrotikSensorEntityDescription, ...] = (
         data_uid="",
         data_reference="mac-address",
         data_attributes_list=DEVICE_ATTRIBUTES_CLIENT_TRAFFIC,
-        func="MikrotikClientTrafficSensor",
+        # func="MikrotikClientTrafficSensor",
     ),
     MikrotikSensorEntityDescription(
         key="environment",