[BUG #7379] removed more references to deleted classes