Handle edge case of removing last item