===> Cleaning for gcr-3.40.0