Remove debug code
Merge remote-tracking branch 'grade_origin/master'