Deleting old catalogs, fixing up behavior