Remove autocompletion and shit
UPSTREAM!