Remove unused event fields

@adamsutton the first two commits are valid in either case, but could you comment on the last one? Does it make sense to remove these fields from a performance point of view?