Metadata Cleanup
Merge pull request #3 from Knewton/t/metadata-cleanup

Metadata Cleanup