Updates for 1.7

Mostly deletions.