Grading interface: clean up