Added deregister feature