fixing search and deleting unused classes