Index: trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 16442)
+++ trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 16443)
@@ -19,10 +19,8 @@
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -322,12 +320,6 @@
     private static void cleanup3000() {
         // see #19053
-        Set<String> toRemove = new HashSet<>();
-        for (Entry<String, String> entry : ignoredErrors.entrySet()) {
-            if (entry.getKey().equals("3000_" + entry.getValue()))
-                toRemove.add(entry.getValue());
-        }
         ignoredErrors.entrySet()
-                .removeIf(e -> toRemove.contains(e.getValue()) && !e.getKey().equals("3000_" + e.getValue()));
-
+                .removeIf(e -> e.getKey().equals("3000_" + e.getValue()));
     }