===> Cleaning for snark-0.5