More metadata service cleanup.