Refactor code to not use catalog because during the upgrader we can have broken catalogs or constraints not indexed correctly