removed references to deleted classes