Clean-up and prepping for tree list