Autocomplete off and minor optimization of the destroy method