Remove the catalog

Closes-Bug: #1165
49 files changed