Change codepath.
Cleanup header file.
Fix testfind for the changed world,