Milestone2  cleanup