Remove unused code & obsolete comment.