Removed most underlined comments