diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 775b6aac8..8e573eb59 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -62,7 +62,6 @@ import java.io.*;
 import java.util.*;
 import java.util.List;
 import java.util.Timer;
-import java.util.function.Predicate;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index cc7356b4e..932b0b05c 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -2592,7 +2592,7 @@ public class Editor extends JFrame implements RunnerListener {
     }
 
     serialMonitor = new MonitorFactory().newMonitor(port);
-    base.setIcon(serialMonitor);
+    Base.setIcon(serialMonitor);
 
     // If currently uploading, disable the monitor (it will be later
     // enabled when done uploading)
@@ -2690,7 +2690,7 @@ public class Editor extends JFrame implements RunnerListener {
     }
 
     serialPlotter = new SerialPlotter(port);
-    base.setIcon(serialPlotter);
+    Base.setIcon(serialPlotter);
 
     // If currently uploading, disable the plotter (it will be later
     // enabled when done uploading)
diff --git a/arduino-core/src/cc/arduino/packages/Uploader.java b/arduino-core/src/cc/arduino/packages/Uploader.java
index 19dec7443..866a0a998 100644
--- a/arduino-core/src/cc/arduino/packages/Uploader.java
+++ b/arduino-core/src/cc/arduino/packages/Uploader.java
@@ -36,7 +36,6 @@ import processing.app.I18n;
 import processing.app.PreferencesData;
 import processing.app.debug.MessageConsumer;
 import processing.app.debug.MessageSiphon;
-import processing.app.debug.RunnerException;
 import processing.app.helpers.ProcessUtils;
 import processing.app.helpers.StringUtils;
 
diff --git a/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java b/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
index b0829cb33..dac28e087 100644
--- a/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
+++ b/arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java
@@ -31,7 +31,6 @@ package cc.arduino.packages.discoverers.serial;
 
 import cc.arduino.packages.BoardPort;
 import cc.arduino.packages.discoverers.SerialDiscovery;
-import cc.arduino.packages.uploaders.SerialUploader;
 import processing.app.BaseNoGui;
 import processing.app.Platform;
 import processing.app.debug.TargetBoard;
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
index aa9ac4c07..b1a5f5b49 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -40,12 +40,9 @@ import processing.app.*;
 import cc.arduino.packages.BoardPort;
 import processing.app.debug.RunnerException;
 import processing.app.debug.TargetPlatform;
-import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMap;
 import processing.app.helpers.StringReplacer;
 
-import cc.arduino.packages.discoverers.SerialDiscovery;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
index d329b9ca2..8642f025a 100644
--- a/arduino-core/src/processing/app/BaseNoGui.java
+++ b/arduino-core/src/processing/app/BaseNoGui.java
@@ -27,7 +27,6 @@ import processing.app.packages.LibraryList;
 import processing.app.packages.UserLibrary;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
index 0c2c1d8cb..3c1372f77 100644
--- a/arduino-core/src/processing/app/Platform.java
+++ b/arduino-core/src/processing/app/Platform.java
@@ -169,13 +169,13 @@ public class Platform {
     return null;
   }
 
-  public  List<String> listSerials(){
-    return new  ArrayList(Arrays.asList(this.listSerialsNative()));
+  public List<String> listSerials() {
+    return new ArrayList<String>(Arrays.asList(listSerialsNative()));
   }
 
   public  List<String> listSerialsNames(){
     List<String> list = new LinkedList<>();
-    for (String port : this.listSerialsNative()) {
+    for (String port : listSerialsNative()) {
       list.add(port.split("_")[0]);
     }
     return list;