autocomplete sucks
cleanup some