Removed unused classes in advanced search
fixes #8