===> Cleaning for gh-2.3.0