reverting to using gift.remove