[PATCH conductor] Deploaybles and catalog_entries cleanups