cleanup
Branch: catalog_checks

Branch: catalog_checks