added autocomplete cleanup