Get rid of current_event_id