===> Cleaning for heirloom-cmp-070715