Minor updates for unused code and comments.