Moving the place where we reset an item's slot

There are three functions to remove an item from a container, but only
one of them was resetting the item's slot. Moving to the one which is
called by the other two.