Make removeAndDestroy return value consistent with remove