Cleanup and update for 1.6.2