Removed other changes than tree-walk tweaks