===> Cleaning for bcal-2.1