Refactor in depTree
Use state eventing only in dependencyTree
Hack-fix weird behaviour on tokenRemoved