diff --git a/server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java
index fc68d58d5de0e..549713fd15261 100644
--- a/server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java
+++ b/server/src/main/java/org/elasticsearch/common/settings/SettingsFilter.java
@@ -28,7 +28,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -104,13 +103,7 @@ private static Settings filterSettings(Iterable<String> patterns, Settings setti
         }
         if (!simpleMatchPatternList.isEmpty()) {
             String[] simpleMatchPatterns = simpleMatchPatternList.toArray(new String[simpleMatchPatternList.size()]);
-            Iterator<String> iterator = builder.keys().iterator();
-            while (iterator.hasNext()) {
-                String key = iterator.next();
-                if (Regex.simpleMatch(simpleMatchPatterns, key)) {
-                    iterator.remove();
-                }
-            }
+            builder.keys().removeIf(key -> Regex.simpleMatch(simpleMatchPatterns, key));
         }
         return builder.build();
     }
diff --git a/server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java b/server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java
index e9eab8fa2550d..87ad0a396ca76 100644
--- a/server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java
+++ b/server/src/main/java/org/elasticsearch/discovery/zen/ElectMasterService.java
@@ -33,7 +33,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -206,12 +205,7 @@ private List<DiscoveryNode> sortedMasterNodes(Iterable<DiscoveryNode> nodes) {
             return null;
         }
         // clean non master nodes
-        for (Iterator<DiscoveryNode> it = possibleNodes.iterator(); it.hasNext(); ) {
-            DiscoveryNode node = it.next();
-            if (!node.isMasterNode()) {
-                it.remove();
-            }
-        }
+        possibleNodes.removeIf(node -> !node.isMasterNode());
         CollectionUtil.introSort(possibleNodes, ElectMasterService::compareNodes);
         return possibleNodes;
     }
diff --git a/server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
index 0a91ba81443ed..75654c077705f 100644
--- a/server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
+++ b/server/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
@@ -245,12 +245,7 @@ private void fillShardCacheWithDataNodes(Map<String, NodeEntry<T>> shardCache, D
             }
         }
         // remove nodes that are not longer part of the data nodes set
-        for (Iterator<String> it = shardCache.keySet().iterator(); it.hasNext(); ) {
-            String nodeId = it.next();
-            if (nodes.nodeExists(nodeId) == false) {
-                it.remove();
-            }
-        }
+        shardCache.keySet().removeIf(nodeId -> !nodes.nodeExists(nodeId));
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java b/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
index e86a8fe191aea..ca42d4dd24135 100644
--- a/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
+++ b/server/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
@@ -64,7 +64,6 @@
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -134,12 +133,7 @@ public void clusterChanged(ClusterChangedEvent event) {
         // remove entries from cache that don't exist in the routing table anymore (either closed or deleted indices)
         // - removing shard data of deleted indices is handled by IndicesClusterStateService
         // - closed indices don't need to be removed from the cache but we do it anyway for code simplicity
-        for (Iterator<ShardId> it = folderNotFoundCache.iterator(); it.hasNext(); ) {
-            ShardId shardId = it.next();
-            if (routingTable.hasIndex(shardId.getIndex()) == false) {
-                it.remove();
-            }
-        }
+        folderNotFoundCache.removeIf(shardId -> !routingTable.hasIndex(shardId.getIndex()));
         // remove entries from cache which are allocated to this node
         final String localNodeId = event.state().nodes().getLocalNodeId();
         RoutingNode localRoutingNode = event.state().getRoutingNodes().node(localNodeId);
diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
index efb1de3e2945c..9a5542d7bbdeb 100644
--- a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
+++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
@@ -2195,14 +2195,8 @@ protected void afterAdd() throws IOException {
             Collections.sort(writtenOperations, (a, b) -> a.location.compareTo(b.location));
             assertFalse(translog.isOpen());
             final Checkpoint checkpoint = Checkpoint.read(config.getTranslogPath().resolve(Translog.CHECKPOINT_FILE_NAME));
-            Iterator<LocationOperation> iterator = writtenOperations.iterator();
-            while (iterator.hasNext()) {
-                LocationOperation next = iterator.next();
-                if (checkpoint.offset < (next.location.translogLocation + next.location.size)) {
-                    // drop all that haven't been synced
-                    iterator.remove();
-                }
-            }
+            // drop all that haven't been synced
+            writtenOperations.removeIf(next -> checkpoint.offset < (next.location.translogLocation + next.location.size));
             try (Translog tlog =
                      new Translog(config, translogUUID, createTranslogDeletionPolicy(),
                          () -> SequenceNumbers.NO_OPS_PERFORMED, primaryTerm::get);