===> Cleaning for compat40-4.0