Using enumerate
Delete unused entries
Merge pull request #237 from geoadmin/dev_catalog_opt

Catalog opt (remove unused fields)