hotplug: cleanup

Conflicts:

	changelog