Remove dead code.
Fix walkers.