remove milestones, use lists