===> Cleaning for gh-2.39.1