===> Cleaning for gh-2.21.2