Removes unused method
Refactors the searching into a single method