Removed extra event handler