Removed old code form TreeWalker