===> Cleaning for heirloom-bfs-070715