diff --git a/custom_components/plugwise/binary_sensor.py b/custom_components/plugwise/binary_sensor.py
index aa2b8f63e..88d2bd7e8 100644
--- a/custom_components/plugwise/binary_sensor.py
+++ b/custom_components/plugwise/binary_sensor.py
@@ -21,7 +21,6 @@
     COMPRESSOR_STATE,
     COOLING_ENABLED,
     COOLING_STATE,
-    COORDINATOR,  # pw-beta
     DHW_STATE,
     DOMAIN,
     FLAME_STATE,
@@ -100,7 +99,7 @@ async def async_setup_entry(
 
     @callback
     def _add_entities() -> None:
-        "Add Entities."
+        """Add Entities."""
         if not coordinator.new_devices:
             return
 
@@ -121,7 +120,7 @@ def _add_entities() -> None:
                 LOGGER.debug(
                     "Add %s %s binary sensor", device[ATTR_NAME], description.translation_key
                 )
-        
+
         async_add_entities(entities)
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
diff --git a/custom_components/plugwise/climate.py b/custom_components/plugwise/climate.py
index 9f547e909..5c48fabd8 100644
--- a/custom_components/plugwise/climate.py
+++ b/custom_components/plugwise/climate.py
@@ -28,7 +28,6 @@
     CONTROL_STATE,
     COOLING_PRESENT,
     COOLING_STATE,
-    COORDINATOR,  # pw-beta
     DEV_CLASS,
     DOMAIN,
     GATEWAY_ID,
diff --git a/custom_components/plugwise/number.py b/custom_components/plugwise/number.py
index 3ebf40369..2e2ddaf21 100644
--- a/custom_components/plugwise/number.py
+++ b/custom_components/plugwise/number.py
@@ -18,7 +18,6 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import (
-    DOMAIN,
     LOGGER,
     LOWER_BOUND,
     MAX_BOILER_TEMP,
diff --git a/custom_components/plugwise/select.py b/custom_components/plugwise/select.py
index 849c8eaae..aea65fd8c 100644
--- a/custom_components/plugwise/select.py
+++ b/custom_components/plugwise/select.py
@@ -16,7 +16,6 @@
     AVAILABLE_SCHEDULES,
     DHW_MODE,
     DHW_MODES,
-    DOMAIN,
     GATEWAY_MODE,
     GATEWAY_MODES,
     LOCATION,
diff --git a/custom_components/plugwise/sensor.py b/custom_components/plugwise/sensor.py
index 5e4848fe1..34b3bc75e 100644
--- a/custom_components/plugwise/sensor.py
+++ b/custom_components/plugwise/sensor.py
@@ -32,7 +32,6 @@
 from .const import (
     DHW_SETPOINT,
     DHW_TEMP,
-    DOMAIN,
     EL_CONS_INTERVAL,
     EL_CONS_OP_CUMULATIVE,
     EL_CONS_OP_INTERVAL,
diff --git a/custom_components/plugwise/switch.py b/custom_components/plugwise/switch.py
index fea6d3696..c2b0fb1a0 100644
--- a/custom_components/plugwise/switch.py
+++ b/custom_components/plugwise/switch.py
@@ -19,7 +19,6 @@
 from .const import (
     COOLING_ENA_SWITCH,
     DHW_CM_SWITCH,
-    DOMAIN,
     LOCK,
     LOGGER,
     MEMBERS,