cleanup the tree support a bit more