===> Cleaning for same-1.8