===> Cleaning for snoopy-2.1.0