Clean version of TreeRecomposer

- Update of enrichment in consequence (some things must be removed; put TODOs)
- Update of a call in ToolBox in consequence