===> Cleaning for heirloom-more-070715