===> Cleaning for nono-0.6.1