Removed a few traces and changed the catalog handler.