[BUG #7379] removed references to deleted classes