Remove unnecessary parts of Catalog stubs