more cleanup on Tree