use vector::erase with std::remove_if am: 0c52b65211

Change-Id: If54639fc970d6470f258f256d88ad783be613925