Cleaning up Encounter validator