Index: applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java	(revision 30527)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java	(revision 30701)
@@ -73,5 +73,5 @@
     public static void correlate( List<NanoLogEntry> entries, GpxData data, long offset ) {
         List<NanoLogEntry> sortedEntries = new ArrayList<NanoLogEntry>(entries);
-        int ret = 0;
+        //int ret = 0;
         PrimaryDateParser dateParser = new PrimaryDateParser();
         Collections.sort(sortedEntries);
@@ -87,5 +87,5 @@
                         try {
                             long curWpTime = dateParser.parse(curWpTimeStr).getTime() + offset;
-                            ret += matchPoints(sortedEntries, prevWp, prevWpTime, curWp, curWpTime, offset);
+                            /*ret +=*/ matchPoints(sortedEntries, prevWp, prevWpTime, curWp, curWpTime, offset);
 
                             prevWp = curWp;
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java	(revision 30527)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java	(revision 30701)
@@ -1,10 +1,7 @@
 package nanolog;
 
-import java.awt.*;
-import java.util.*;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Bounds;
+import java.util.Date;
+
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.MapView;
 
 /**
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 30527)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 30701)
@@ -305,8 +305,4 @@
         private boolean toZero;
 
-        public CorrelateEntries() {
-            this(false);
-        }
-
         public CorrelateEntries( boolean toZero ) {
             super(toZero ? tr("Correlate with GPX...") : tr("Put on GPX..."), "nanolog/correlate", tr("Correlate entries with GPS trace"), null, false);
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 30527)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 30701)
@@ -1,15 +1,20 @@
 package nanolog;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Rectangle;
 import java.text.SimpleDateFormat;
-import java.util.*;
-import javax.swing.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.AbstractListModel;
+import javax.swing.JList;
+
 import nanolog.NanoLogLayer.NanoLogLayerListener;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
-import static org.openstreetmap.josm.tools.I18n.tr;
-import org.openstreetmap.josm.tools.Shortcut;
 
 /**