Use Iterables.removeIf to safely remove item from iterable.

+review REVIEW-5216