Cleaning up outdated code