===> Cleaning for mc-4.8.23