===> Cleaning for sniff-2.0