tree 1.7.0

with additional clean-up