===> Cleaning for bc-gh-3.3.0