clean-up and moved receivers registering