hotplug: cleanup & changes