Removed more deprecated classes (referencing already removed classes)