diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index ffaf050b..c5b38fcb 100755
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -21,17 +21,9 @@ from homeassistant.components.homeassistant import (
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_BRIGHTNESS_PCT,
-    ATTR_BRIGHTNESS_STEP,
-    ATTR_BRIGHTNESS_STEP_PCT,
-    ATTR_COLOR_NAME,
     ATTR_COLOR_TEMP,
-    ATTR_EFFECT,
-    ATTR_HS_COLOR,
-    ATTR_KELVIN,
     ATTR_RGB_COLOR,
     ATTR_TRANSITION,
-    ATTR_WHITE_VALUE,
-    ATTR_XY_COLOR,
     DOMAIN as LIGHT_DOMAIN,
     SUPPORT_BRIGHTNESS,
     SUPPORT_COLOR,
@@ -132,28 +124,9 @@ RGB_CHANGE = 30  # ≈12% of total range per component
 # Keep a short domain version for the context instances (which can only be 36 chars)
 _DOMAIN_SHORT = "adapt_lgt"
 
-_DISABLE_ON = {
-    ATTR_BRIGHTNESS,
-    ATTR_BRIGHTNESS,
-    ATTR_BRIGHTNESS_PCT,
-    ATTR_BRIGHTNESS,
-    ATTR_BRIGHTNESS_STEP,
-    ATTR_BRIGHTNESS,
-    ATTR_BRIGHTNESS_STEP_PCT,
-    ATTR_BRIGHTNESS,
-    ATTR_COLOR_NAME,
-    ATTR_RGB_COLOR,
-    ATTR_XY_COLOR,
-    ATTR_HS_COLOR,
-    ATTR_COLOR_TEMP,
-    ATTR_KELVIN,
-    ATTR_WHITE_VALUE,
-    ATTR_EFFECT,
-}
-
 
 def _short_hash(string: str, length: int = 4) -> str:
-    """Creates a hash of 'string' with length 'length'."""
+    """Create a hash of 'string' with length 'length'."""
     return hashlib.sha1(string.encode("UTF-8")).hexdigest()[:length]
 
 
@@ -648,7 +621,11 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
         force: bool = False,
         context: Optional[Context] = None,
     ) -> None:
-        _LOGGER.debug("%s: '_update_attrs_and_maybe_adapt_lights' called", self._name)
+        _LOGGER.debug(
+            "%s: '_update_attrs_and_maybe_adapt_lights' called with context.id='%s'",
+            self._name,
+            context.id,
+        )
         assert self.is_on
         self._settings = self._sun_light_settings.get_settings(
             self.sleep_mode_switch.is_on
@@ -686,9 +663,10 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
                 )
             ):
                 _LOGGER.debug(
-                    "%s: '%s' is being manually controlled, stop adapting.",
+                    "%s: '%s' is being manually controlled, stop adapting, context.id=%s.",
                     self._name,
                     light,
+                    context.id,
                 )
                 continue
             await self._adapt_light(light, transition, force=force, context=context)
@@ -789,7 +767,6 @@ class AdaptiveSleepModeSwitch(SwitchEntity, RestoreEntity):
     async def async_added_to_hass(self) -> None:
         """Call when entity about to be added to hass."""
         last_state = await self.async_get_last_state()
-        # XXX: state isn't correctly restored!
         if last_state is None or STATE_OFF:  # newly added to HA
             await self.async_turn_off()
         else:
@@ -1082,23 +1059,12 @@ class TurnOnOffListener:
             manually_controlled = self.manually_controlled[light] = True
             _LOGGER.debug(
                 "'%s' was already on and 'light.turn_on' was not called by the"
-                " adaptive_lighting integration, the Adaptive Lighting will stop"
-                " adapting the light until the switch or the light turns off and"
-                " then on again.",
+                " adaptive_lighting integration (context.id='%s'), the Adaptive"
+                " Lighting will stop adapting the light until the switch or the"
+                " light turns off and then on again.",
                 light,
+                turn_on_event.context.id,
             )
-        # if (
-        #     turn_on_event is not None
-        #     and not is_our_context(turn_on_event.context)
-        #     and any(_DISABLE_ON.intersection(turn_on_event.data[ATTR_SERVICE_DATA]))
-        # ):
-        #     # XXX: add comment
-        #     _LOGGER.debug(
-        #         "'light.turn_on' was called on '%s' with settings '%s' so we stop adapting",
-        #         light,
-        #         turn_on_event.data[ATTR_SERVICE_DATA],
-        #     )
-        #     manually_controlled = self.manually_controlled[light] = True
         return manually_controlled
 
     async def significant_change(