- - removed anything having to do with event_type/event_object