Remove deprecated useage of catalog controller