Removing automatic dynamic registration