removed legacy code around cat#