===> Cleaning for nono-1.8.0