final cleanup and changes before 1.27 release