cleanup and changelog for #1624