autocomplete cleanups