Remove ConcurrentModificationException