remove unused methods
Add new finder
new search method