Minor edits to comment-out unused code.