Remove pass_event (deprecated) and replace with next