===> Cleaning for heirloom-su-070715