Merge "Remove obsolete comment"