remove duplicate event handling