gut most v2/v3 functions from query/catalogs