Changes to deregister