Remove use of unify in the catalog