===> Cleaning for eag-2.6