Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 7329)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 7330)
@@ -104,5 +104,5 @@
     /**
      * If the primitive is annotated with a tag such as note, fixme, etc.
-     * Match the "work in progress" tags in default elemstyles.xml.
+     * Match the "work in progress" tags in default map style.
      */
     protected static final int FLAG_ANNOTATED = 1 << 12;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java	(revision 7329)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java	(revision 7330)
@@ -269,5 +269,5 @@
                 }
             }
-            
+
             /* Migration code can be removed ~ Nov. 2014 */
             if (!Main.pref.getBoolean("mappaint.style.migration.switchedToMapCSS", false)) {
@@ -299,9 +299,4 @@
         @Override
         public Collection<ExtendedSourceEntry> getDefault() {
-            ExtendedSourceEntry defJosmXml = new ExtendedSourceEntry("elemstyles.xml", "resource://styles/standard/elemstyles.xml");
-            defJosmXml.active = false;
-            defJosmXml.name = "standard";
-            defJosmXml.title = tr("JOSM default (XML; old version)");
-            defJosmXml.description = tr("Internal style to be used as base for runtime switchable overlay styles");
             ExtendedSourceEntry defJosmMapcss = new ExtendedSourceEntry("elemstyles.mapcss", "resource://styles/standard/elemstyles.mapcss");
             defJosmMapcss.active = true;
@@ -315,5 +310,5 @@
             defPL2.description = tr("the main Potlatch 2 style");
 
-            return Arrays.asList(new ExtendedSourceEntry[] { defJosmXml, defJosmMapcss, defPL2 });
+            return Arrays.asList(new ExtendedSourceEntry[] { defJosmMapcss, defPL2 });
         }