Safer onRemove override