Removing custom walk() implementation