Removes some optional elements. Fewer lines, less to maintain!