===> Cleaning for gh-2.18.1