Remove unneeded variables.
Ad the new autocomplete search. re #34
Cleanup. re #34