===> Cleaning for gh-2.40.1