Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 14883)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 14884)
@@ -37,7 +37,5 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.TreeMap;
 
 import javax.swing.Icon;
@@ -97,9 +95,4 @@
     private OsmDataLayer dataLayer;
 
-//    /**
-//     * Flag that manager activation layer
-//     */
-//    private boolean layerAdded = false;
-
     /**
      * Default constructor
@@ -158,20 +151,4 @@
         return nearest;
     }
-
-//	/**
-//	 * Check if layer is load.
-//	 * @return <code>true</code> Layer load.
-//	 *         <code>false</code> Layer don't load.
-//	 */
-//	public boolean isLayerAdded() {
-//		return layerAdded;
-//	}
-//
-//	/**
-//	 * Setter layer active.
-//	 */
-//	public void setLayerAdded() {
-//		layerAdded = true;
-//	}
 
 	/*
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingModel.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingModel.java	(revision 14883)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingModel.java	(revision 14884)
@@ -56,10 +56,10 @@
      * Graph to calculate route
      */
-	public RoutingGraph routingGraph;
+	public RoutingGraph routingGraph=null;
 
     /**
      * List of nodes that the route has to traverse
      */
-    private List<Node> nodes;
+    private List<Node> nodes=null;
 
     private List<OsmEdge> path=null;
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 14883)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 14884)
@@ -25,8 +25,5 @@
  *
  */
-/*
- * Christof Dallermassl
- * christof@dallermassl.at
- */
+
 
 package com.innovant.josm.plugin.routing;
@@ -34,5 +31,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 
@@ -223,6 +219,4 @@
 			// Set layer on top and select layer, also refresh toggleDialog to reflect selection
 			Main.map.mapView.moveLayer(newLayer, 0);
-//			Main.map.mapView.setActiveLayer(newLayer);
-//			Main.map.toggleDialogs.repaint();
 			logger.debug("Added routing layer.");
 		}