Further cleanup of fields in Encounter