Merge "Use std::erase_if to simplify removal of items"