More cleanup. Now with working search.