cleanups for 1.6 release