Correcting flake error on unused import
Merge branch 'tidy-up-core' into metadata-provider