===> Cleaning for ecl-16.1.2