removed a few unnecessary events