Removed unneeded class
Removed code using old tree traversal