Removed some old code.
Removed debug code related to searching.