Cleaned up the rest of the autocompletion remnants