Conditional remove