Removed references to deprecated classes
Authored by: car031 2022-05-17
Parent: [r9700]
Child: [r9702]