cleanup and changelog for 1689