More metadata cleanups