Simplified exit field add/remove code