[REFACTOR] refs #35788 @0.25 The use of the Class class was not
necessary