convert to autocomplete widget
Move some unused classes to extras repo