removes classes that should have been deleted in #4817547

Removes classes that are no longer used. They became superfluous with the introduction of policies but weren't deleted.