Remove old code.
Add recursive version.