Added autocompleter
Updated
Removed unused code