===> Cleaning for ne-3.18