Cleanup unnecessary metadat