Update for 1.6
Cleanup