+unregistration clean-up (untested)