more metadata cleanup
Merge pull request #2350 from tysonn/master

more metadata cleanup