Clean up some outdated code and comments.