A few deletions and refactorings related to judge classes.