Removed some unused code
Merging in changes made in branch 'dataaccess' by Jing Tao.
Made initial changes for accepting EML version 2.1.0 in Metacat