Remove extra classes and merge fields into Event.class