Revert "Catalog"

This reverts commit 5c8cbb8b0da4bfb2cc32928dabfb8b6ee33f90e1.