Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java	(revision 9884)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java	(revision 9891)
@@ -13,5 +13,4 @@
 import org.openstreetmap.josm.plugins.validator.Severity;
 import org.openstreetmap.josm.plugins.validator.Test;
-import org.openstreetmap.josm.plugins.validator.util.Util;
 import org.openstreetmap.josm.plugins.validator.TestError;
 
@@ -70,5 +69,5 @@
 	public void visit(Node n)
 	{
-		if(!n.incomplete && !n.deleted && Util.countDataTags(n) == 0)
+		if(!n.incomplete && !n.deleted && !n.tagged)
 			emptyNodes.add(n);
 	}
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java	(revision 9884)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java	(revision 9891)
@@ -13,5 +13,4 @@
 import org.openstreetmap.josm.plugins.validator.Test;
 import org.openstreetmap.josm.plugins.validator.TestError;
-import org.openstreetmap.josm.plugins.validator.util.Util;
 
 /**
@@ -80,5 +79,5 @@
 		}
 
-		if(Util.countDataTags(w) == 0)
+		if(!w.tagged)
 		{
 			errors.add( new TestError(this, Severity.WARNING, tr("Untagged ways"), UNTAGGED_WAY, w) );
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java	(revision 9884)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java	(revision 9891)
@@ -28,20 +28,4 @@
 public class Util
 {
-	/** Tags without informational contents */
-	private static final String[] noDataTags = new String[] { "created_by", "converted_by", "source" };
-	public static int countDataTags(OsmPrimitive osm)
-	{
-		int numTags = 0;
-		Map<String, String> tags = osm.keys;
-		if(tags != null)
-		{
-			numTags = tags.size();
-			for(String tag : noDataTags)
-				if(tags.containsKey(tag))
-					--numTags;
-		}
-		return numTags;
-	}
-
 	/**
 	 * Returns the plugin's directory of the plugin