Eligibility criteria cleanup