Event handling clean up