Merge "Remove obsolete comment and option."