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

Metadata Cleanup