Refactoring things with autocomplete

Took out crufty and slow junk.