minor Refactoring
remove unused code
searching DONE