Fixed null pointer exception from web-grader and deleted un-need pieces
of code