auto_hotplug: clean up and update