more changes to remove()