Remove the old autocompletion code