===> Cleaning for compat50-5.0