Catalog opt (remove unused fields)

 Issue #103