Milestone1 cleanup, regression testing