Removing superfluous calls to undelegateEvents