Remove unnecessary EventHandler arguments