fix remove event
fix event 2 trace as well