===> Cleaning for eh-1.9.0