remove undelegateEvents call from remove