Remove CatalogSource and ExternalSource entry types