Clean up references to removed classes.
Implement validators for grading.
Fix creating new annotations.