Merge "use vector::erase with std::remove_if"