Clean out unused code and comments.