diff --git a/DataExtractionOSM/src/gnu/trove/map/hash/TIntObjectHashMap.java b/DataExtractionOSM/src/gnu/trove/map/hash/TIntObjectHashMap.java
index 2b0f06ed43..f49a77e70e 100644
--- a/DataExtractionOSM/src/gnu/trove/map/hash/TIntObjectHashMap.java
+++ b/DataExtractionOSM/src/gnu/trove/map/hash/TIntObjectHashMap.java
@@ -20,22 +20,30 @@
 
 package gnu.trove.map.hash;
 
-import gnu.trove.map.TIntObjectMap;
+import gnu.trove.TIntCollection;
+import gnu.trove.function.TObjectFunction;
 import gnu.trove.impl.Constants;
 import gnu.trove.impl.HashFunctions;
-import gnu.trove.impl.hash.*;
+import gnu.trove.impl.hash.THashPrimitiveIterator;
+import gnu.trove.impl.hash.TIntHash;
+import gnu.trove.iterator.TIntIterator;
+import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.map.TIntObjectMap;
 import gnu.trove.procedure.TIntObjectProcedure;
 import gnu.trove.procedure.TIntProcedure;
 import gnu.trove.procedure.TObjectProcedure;
-import gnu.trove.iterator.TIntIterator;
-import gnu.trove.iterator.TIntObjectIterator;
-import gnu.trove.iterator.TPrimitiveIterator;
-import gnu.trove.function.TObjectFunction;
 import gnu.trove.set.TIntSet;
-import gnu.trove.TIntCollection;
 
-import java.io.*;
-import java.util.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 
 //////////////////////////////////////////////////
diff --git a/DataExtractionOSM/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java b/DataExtractionOSM/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
index 39f100cb89..e8ecec9520 100644
--- a/DataExtractionOSM/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
+++ b/DataExtractionOSM/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java
@@ -3,15 +3,14 @@ package net.osmand.binary;
 import java.io.IOException;
 import java.util.List;
 
-import net.osmand.ResultMatcher;
 import net.osmand.StringMatcher;
 import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
 import net.osmand.data.Building;
 import net.osmand.data.City;
+import net.osmand.data.City.CityType;
 import net.osmand.data.MapObject;
 import net.osmand.data.PostCode;
 import net.osmand.data.Street;
-import net.osmand.data.City.CityType;
 import net.osmand.osm.LatLon;
 import net.osmand.osm.MapUtils;
 import net.sf.junidecode.Junidecode;
diff --git a/DataExtractionOSM/src/net/osmand/binary/BinaryMapTransportReaderAdapter.java b/DataExtractionOSM/src/net/osmand/binary/BinaryMapTransportReaderAdapter.java
index 98bf8a2f65..42e560d54d 100644
--- a/DataExtractionOSM/src/net/osmand/binary/BinaryMapTransportReaderAdapter.java
+++ b/DataExtractionOSM/src/net/osmand/binary/BinaryMapTransportReaderAdapter.java
@@ -1,9 +1,8 @@
 package net.osmand.binary;
 
-import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.TIntObjectMap;
-import gnu.trove.map.hash.TIntObjectHashMap;
 import static net.osmand.binary.BinaryMapIndexReader.TRANSPORT_STOP_ZOOM;
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java
index 78bc923c52..e723a99685 100644
--- a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java
+++ b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java
@@ -1,12 +1,5 @@
 package net.osmand.data.index;
 
-import static net.osmand.data.IndexConstants.BINARY_MAP_INDEX_EXT;
-import static net.osmand.data.IndexConstants.BINARY_MAP_INDEX_EXT_ZIP;
-import static net.osmand.data.IndexConstants.BINARY_MAP_VERSION;
-import static net.osmand.data.IndexConstants.VOICE_INDEX_EXT_ZIP;
-import static net.osmand.data.IndexConstants.VOICE_VERSION;
-
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -18,10 +11,7 @@ import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 import net.osmand.LogUtil;
diff --git a/DataExtractionOSM/src/net/osmand/swing/MapClusterLayer.java b/DataExtractionOSM/src/net/osmand/swing/MapClusterLayer.java
index a6c5a9ff4c..0f31e5e9a6 100644
--- a/DataExtractionOSM/src/net/osmand/swing/MapClusterLayer.java
+++ b/DataExtractionOSM/src/net/osmand/swing/MapClusterLayer.java
@@ -31,7 +31,6 @@ import net.osmand.osm.MapUtils;
 import net.osmand.osm.Node;
 import net.osmand.osm.Way;
 import net.osmand.router.BinaryRoutePlanner;
-import net.osmand.router.RouteSegmentResult;
 import net.osmand.router.RoutingContext;
 import net.osmand.router.BinaryRoutePlanner.RouteSegment;
 import net.osmand.router.BinaryRoutePlanner.RouteSegmentVisitor;
diff --git a/DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java
index 9c3177dd7d..3f800ada6f 100644
--- a/DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java
+++ b/DataExtractionOSM/src/net/osmand/swing/OsmExtractionPreferencesDialog.java
@@ -20,7 +20,6 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 
 import net.osmand.data.preparation.MapZooms;
-import net.osmand.data.preparation.MapZooms.MapZoomPair;
 
 public class OsmExtractionPreferencesDialog extends JDialog {