diff --git a/styleguide/checkstyle.xml b/styleguide/checkstyle.xml
index 66461b781f..bfafc17578 100644
--- a/styleguide/checkstyle.xml
+++ b/styleguide/checkstyle.xml
@@ -51,6 +51,8 @@
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
         <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java
index 4d757c7d87..6b9112e001 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java
@@ -13,7 +13,6 @@ import edu.wpi.first.wpilibj.hal.HAL;
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 import edu.wpi.first.wpilibj.livewindow.LiveWindowSendable;
 import edu.wpi.first.wpilibj.tables.ITable;
-import edu.wpi.first.wpilibj.util.AllocationException;
 
 /**
  * Analog output class.
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogTrigger.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogTrigger.java
index 9247f77a1a..426c25ba00 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogTrigger.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogTrigger.java
@@ -16,8 +16,6 @@ import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
 import edu.wpi.first.wpilibj.hal.HAL;
 import edu.wpi.first.wpilibj.util.BoundaryException;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * Class for creating and configuring Analog Triggers.
  */
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
index 7f981c260b..6ce2aed39b 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
@@ -12,7 +12,6 @@ import edu.wpi.cscore.CvSink;
 import edu.wpi.cscore.CvSource;
 import edu.wpi.cscore.MjpegServer;
 import edu.wpi.cscore.UsbCamera;
-import edu.wpi.cscore.VideoEvent;
 import edu.wpi.cscore.VideoException;
 import edu.wpi.cscore.VideoListener;
 import edu.wpi.cscore.VideoMode;
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DriverStation.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DriverStation.java
index d43b3b0787..c2ea86e5f8 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DriverStation.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/DriverStation.java
@@ -18,7 +18,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import edu.wpi.first.wpilibj.hal.AllianceStationID;
 import edu.wpi.first.wpilibj.hal.ControlWord;
 import edu.wpi.first.wpilibj.hal.HAL;
-import edu.wpi.first.wpilibj.hal.HALUtil;
 import edu.wpi.first.wpilibj.hal.PowerJNI;
 
 /**
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java
index 1af7bc28ec..85305eac63 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java
@@ -14,7 +14,6 @@ import edu.wpi.first.wpilibj.hal.PWMJNI;
 import edu.wpi.first.wpilibj.livewindow.LiveWindowSendable;
 import edu.wpi.first.wpilibj.tables.ITable;
 import edu.wpi.first.wpilibj.tables.ITableListener;
-import edu.wpi.first.wpilibj.util.AllocationException;
 
 /**
  * Class implements the PWM generation in the FPGA.
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java
index 0a96cb217b..48a5347e16 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java
@@ -7,7 +7,6 @@
 
 package edu.wpi.first.wpilibj;
 
-import edu.wpi.first.wpilibj.hal.DIOJNI;
 import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
 import edu.wpi.first.wpilibj.hal.HAL;
 import edu.wpi.first.wpilibj.hal.RelayJNI;
@@ -15,7 +14,6 @@ import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 import edu.wpi.first.wpilibj.livewindow.LiveWindowSendable;
 import edu.wpi.first.wpilibj.tables.ITable;
 import edu.wpi.first.wpilibj.tables.ITableListener;
-import edu.wpi.first.wpilibj.util.AllocationException;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/EncoderJNI.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/EncoderJNI.java
index 4cc3e48989..bcc7e6b457 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/EncoderJNI.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/EncoderJNI.java
@@ -7,8 +7,6 @@
 
 package edu.wpi.first.wpilibj.hal;
 
-import java.nio.IntBuffer;
-
 public class EncoderJNI extends JNIWrapper {
 
   public static native int initializeEncoder(int digitalSourceHandleA, int analogTriggerTypeA,
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java
index bb01f2212a..d2c5088451 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java
@@ -7,8 +7,6 @@
 
 package edu.wpi.first.wpilibj.hal;
 
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
-
 /**
  * JNI wrapper for library <b>FRC_NetworkCommunication</b><br>.
  */
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java
index ae8bd2cacc..1e34e71e30 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/HAL.java
@@ -9,8 +9,6 @@ package edu.wpi.first.wpilibj.hal;
 
 import java.nio.ByteBuffer;
 
-import edu.wpi.first.wpilibj.hal.JNIWrapper;
-
 /**
  * JNI Wrapper for HAL<br>.
  */
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java
index 85b46ec17f..839f56226e 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java
@@ -8,13 +8,10 @@
 package edu.wpi.first.wpilibj.hal;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
 
-//
-// base class for all JNI wrappers
-//
+/**
+ * Base class for all JNI wrappers.
+ */
 public class JNIWrapper {
   static boolean libraryLoaded = false;
   static File jniLibrary = null;
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/SPIJNI.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/SPIJNI.java
index 044d7ee1ba..d49a20e9d5 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/SPIJNI.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/SPIJNI.java
@@ -8,7 +8,6 @@
 package edu.wpi.first.wpilibj.hal;
 
 import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
 import java.nio.LongBuffer;
 
 @SuppressWarnings("AbbreviationAsWordInName")
diff --git a/wpilibj/src/shared/java/edu/wpi/first/wpilibj/command/Command.java b/wpilibj/src/shared/java/edu/wpi/first/wpilibj/command/Command.java
index 31fb4486e2..3c61fa681d 100644
--- a/wpilibj/src/shared/java/edu/wpi/first/wpilibj/command/Command.java
+++ b/wpilibj/src/shared/java/edu/wpi/first/wpilibj/command/Command.java
@@ -9,7 +9,6 @@ package edu.wpi.first.wpilibj.command;
 
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
-import java.util.Vector;
 
 import edu.wpi.first.wpilibj.NamedSendable;
 import edu.wpi.first.wpilibj.RobotState;
diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/ConstantsPortsTest.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/ConstantsPortsTest.java
index 4a975e5c60..e7c9907103 100644
--- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/ConstantsPortsTest.java
+++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/ConstantsPortsTest.java
@@ -7,9 +7,6 @@
 
 package edu.wpi.first.wpilibj;
 
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.logging.Logger;
diff --git a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
index 9a4f0ef5b5..71251ecb08 100644
--- a/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
+++ b/wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
@@ -17,7 +17,6 @@ import edu.wpi.first.wpilibj.AnalogGyro;
 import edu.wpi.first.wpilibj.AnalogInput;
 import edu.wpi.first.wpilibj.AnalogOutput;
 import edu.wpi.first.wpilibj.DigitalInput;
-import edu.wpi.first.wpilibj.DigitalOutput;
 import edu.wpi.first.wpilibj.Jaguar;
 import edu.wpi.first.wpilibj.PIDSource;
 import edu.wpi.first.wpilibj.Relay;
@@ -32,7 +31,6 @@ import edu.wpi.first.wpilibj.fixtures.FilterOutputFixture;
 import edu.wpi.first.wpilibj.fixtures.MotorEncoderFixture;
 import edu.wpi.first.wpilibj.fixtures.RelayCrossConnectFixture;
 import edu.wpi.first.wpilibj.fixtures.TiltPanCameraFixture;
-import edu.wpi.first.wpilibj.mockhardware.FakePotentiometerSource;
 
 /**
  * This class provides access to all of the elements on the test bench, for use in fixtures. This