Clean up 1.6 branch.