Remove MetadataService