Remove unused code and comment changes.