Removed fields from Encounter and Refill Screen