Remove EventHelper from Event, add event in params