Cleanup to get ready for grader by-student view