Missed the ElementCatalog and SiteCatalog entries for uninstall tool