Cleaning up of registration