===> Cleaning for ecl-9.8.4