===> Cleaning for p2c-1.20