===> Cleaning for bc-gh-2.3.1