Improve remove()