Move away from use IMetadata, we don't actually use it.