===> Cleaning for gh-2.17.0