Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java	(revision 17862)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java	(revision 17863)
@@ -97,5 +97,5 @@
     @Override
     public boolean isPrimitiveUsable(OsmPrimitive p) {
-        return p.isTagged() && p instanceof Way && p.hasTag("highway")  && super.isPrimitiveUsable(p);
+        return p.isTagged() && p instanceof Way && p.hasTag("highway") && super.isPrimitiveUsable(p);
     }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 17862)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 17863)
@@ -34,5 +34,4 @@
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;