Remove all references to data catalogs