For #2015: Even more tree and menu removal

- following 7defa1a2d2348419ff14ea84238aa26cc50b9d12
- one test was using xxf:tree
- also removed samples