Remove unused metadata attributes; slight improvements.
Comment out unicorn options not yet used in sub resource options collection.