removed some more deprecated classes