diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index 444888c907d..ecbd54938a6 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -27,7 +27,6 @@
 import cc.arduino.CompilerProgressListener;
 import cc.arduino.UploaderUtils;
 import cc.arduino.packages.Uploader;
-import org.apache.commons.codec.digest.DigestUtils;
 import processing.app.debug.RunnerException;
 import processing.app.forms.PasswordAuthorizationDialog;
 import processing.app.helpers.FileUtils;
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/GenericNetworkUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/GenericNetworkUploader.java
index 3a7cabf4915..1bc5befe4b4 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/GenericNetworkUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/GenericNetworkUploader.java
@@ -38,8 +38,6 @@
 import java.io.File;
 import java.util.List;
 
-import static processing.app.I18n.tr;
-
 public class GenericNetworkUploader extends Uploader {
 
   private final BoardPort port;
diff --git a/arduino-core/src/cc/arduino/utils/network/FileDownloader.java b/arduino-core/src/cc/arduino/utils/network/FileDownloader.java
index 4d090283d87..2702767dbae 100644
--- a/arduino-core/src/cc/arduino/utils/network/FileDownloader.java
+++ b/arduino-core/src/cc/arduino/utils/network/FileDownloader.java
@@ -207,8 +207,10 @@ private void downloadFile() throws InterruptedException {
         file.write(buffer, 0, read);
         setDownloaded(getDownloaded() + read);
 
-        if (Thread.interrupted())
+        if (Thread.interrupted()) {
+          file.close();
           throw new InterruptedException();
+        }
       }
 
       if (getDownloadSize() != null) {
diff --git a/arduino-core/src/processing/app/I18n.java b/arduino-core/src/processing/app/I18n.java
index 72b67a8ecd5..0ab961aa9ed 100644
--- a/arduino-core/src/processing/app/I18n.java
+++ b/arduino-core/src/processing/app/I18n.java
@@ -70,11 +70,6 @@ static protected void init(String language) throws MissingResourceException {
     PROMPT_BROWSE = tr("Browse");
   }
 
-  @Deprecated
-  public static String _(String s) {
-    return tr(s);
-  }
-
   public static String tr(String s) {
     String res;
     try {
diff --git a/arduino-core/src/processing/app/SketchCode.java b/arduino-core/src/processing/app/SketchCode.java
index 3e185867641..db0f95af07f 100644
--- a/arduino-core/src/processing/app/SketchCode.java
+++ b/arduino-core/src/processing/app/SketchCode.java
@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/arduino-core/src/processing/app/linux/Platform.java b/arduino-core/src/processing/app/linux/Platform.java
index f28df35559b..505b9cf88b5 100644
--- a/arduino-core/src/processing/app/linux/Platform.java
+++ b/arduino-core/src/processing/app/linux/Platform.java
@@ -22,18 +22,10 @@
 
 package processing.app.linux;
 
-import org.apache.commons.exec.CommandLine;
-import org.apache.commons.exec.DefaultExecutor;
-import org.apache.commons.exec.Executor;
-import org.apache.commons.exec.PumpStreamHandler;
 import processing.app.PreferencesData;
-import processing.app.debug.TargetPackage;
 import processing.app.legacy.PConstants;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.IOException;
-import java.util.Map;
 
 
 /**
diff --git a/arduino-core/src/processing/app/macosx/Platform.java b/arduino-core/src/processing/app/macosx/Platform.java
index 7c076882371..0325b5d50d9 100644
--- a/arduino-core/src/processing/app/macosx/Platform.java
+++ b/arduino-core/src/processing/app/macosx/Platform.java
@@ -29,7 +29,6 @@
 import org.apache.commons.exec.Executor;
 import org.apache.commons.exec.PumpStreamHandler;
 import org.apache.commons.lang3.StringUtils;
-import processing.app.debug.TargetPackage;
 import processing.app.legacy.PApplet;
 import processing.app.legacy.PConstants;
 
@@ -41,7 +40,6 @@
 import java.net.URI;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 
 /**
diff --git a/arduino-core/src/processing/app/windows/Platform.java b/arduino-core/src/processing/app/windows/Platform.java
index 1783a176042..790be03ed9b 100644
--- a/arduino-core/src/processing/app/windows/Platform.java
+++ b/arduino-core/src/processing/app/windows/Platform.java
@@ -24,16 +24,9 @@
 
 import cc.arduino.os.windows.FolderFinderInWindowsEnvVar;
 import cc.arduino.os.windows.FolderFinderInWindowsRegistry;
-import org.apache.commons.exec.CommandLine;
-import org.apache.commons.exec.DefaultExecutor;
-import org.apache.commons.exec.Executor;
-import org.apache.commons.exec.PumpStreamHandler;
-import processing.app.BaseNoGui;
-import processing.app.debug.TargetPackage;
 import processing.app.legacy.PApplet;
 import processing.app.legacy.PConstants;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -41,7 +34,6 @@
 import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 
 public class Platform extends processing.app.Platform {