===> Cleaning for eor-1.0.2