changelog and cleanup for #1706
[skip ci]