Avoid concurrent modification exception not removing while iterating

Change-Id: I4754e1c2c71a19b38f7efd7a7e1f0e8e966f228f