===> Cleaning for ee-1.5.2