Cleanup and 1.6 Complete update