===> Cleaning for nono-1.7.0