Remove obsolete CBT stuff