Get rid of some more classinfos