===> Cleaning for edt-1.9