Clean up for `catalog` module