#2 Better unregistering.