===> Cleaning for heirloom-cp-070715