Remove old search code; add memory