===> Cleaning for cvm-0.96