Remove duplicate event handler