Removed some more catools compatability code.