Removing uneeded event handlers