Simpler handling of controller removal