getting rid off unused event calls

Getting rid off unused event calls and refactoring reset function.