Decomposer spec: drop unused tree
Decomposer spec: minor renaming