Cleaning up cohort search variants