Keep tree in a file
Remove debug code