removes classes that should have been deleted in #4817547
Merge pull request #2003 from opf/fix/remove_duplicate_classes

removes classes that should have been deleted in #4817547