milestone, cleanup for v1.7