Removing an unneeded event handler