* Async remove call removed too much, resulting in disabled entities coming back after a restart * Calling super().async_remove is no longer needed, changed to self.async_remove * Yes, they should be sets...