remove extra event handlers