refactoring, removed unused events and functions, mainly related to grading