removed extraneous class, removed old search code