AJ-1573 Cleaning up rubric grader controller.