more event clean up