Revert "clean up tree"

This reverts commit 592c6a8482340210017963547360d3c4ce762fa4.