Remove broken/unused code. Add Tab completion