cleanup
* about to create a 1.7 update branch