===> Cleaning for nnn-4.7