===> Cleaning for compat20-2.1