Improve remove event handling