removed some CatalogController logic