- removed anything having to with event_type/event_object