simplified remove_any logic
fixed merge issue