diff --git a/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp b/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp
index 18f63d472f..231c505f69 100644
--- a/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp
+++ b/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp
@@ -7,7 +7,6 @@
 
 #include "SmartDashboard/SmartDashboard.h"
 
-//#include "NetworkCommunication/UsageReporting.h"
 #include "HLUsageReporting.h"
 #include "SmartDashboard/NamedSendable.h"
 #include "WPIErrors.h"
diff --git a/wpilibc/sim/src/DriverStation.cpp b/wpilibc/sim/src/DriverStation.cpp
index 72ae7ad45a..2e83b941e4 100644
--- a/wpilibc/sim/src/DriverStation.cpp
+++ b/wpilibc/sim/src/DriverStation.cpp
@@ -6,14 +6,16 @@
 /*----------------------------------------------------------------------------*/
 
 #include "DriverStation.h"
-#include "Timer.h"
-#include "simulation/MainNode.h"
-//#include "MotorSafetyHelper.h"
+
 #include <string.h>
+
+#include <boost/mem_fn.hpp>
+
 #include "Log.h"
+#include "Timer.h"
 #include "Utility.h"
 #include "WPIErrors.h"
-#include "boost/mem_fn.hpp"
+#include "simulation/MainNode.h"
 
 const uint32_t DriverStation::kBatteryChannel;
 const uint32_t DriverStation::kJoystickPorts;
diff --git a/wpilibc/sim/src/Jaguar.cpp b/wpilibc/sim/src/Jaguar.cpp
index e1691d1dfa..d14684529b 100644
--- a/wpilibc/sim/src/Jaguar.cpp
+++ b/wpilibc/sim/src/Jaguar.cpp
@@ -6,7 +6,6 @@
 /*----------------------------------------------------------------------------*/
 
 #include "Jaguar.h"
-//#include "NetworkCommunication/UsageReporting.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**
diff --git a/wpilibc/sim/src/PWM.cpp b/wpilibc/sim/src/PWM.cpp
index 7264e55521..9e8babfe42 100644
--- a/wpilibc/sim/src/PWM.cpp
+++ b/wpilibc/sim/src/PWM.cpp
@@ -7,7 +7,6 @@
 
 #include "PWM.h"
 
-//#include "NetworkCommunication/UsageReporting.h"
 #include "Utility.h"
 #include "WPIErrors.h"
 
diff --git a/wpilibc/sim/src/Relay.cpp b/wpilibc/sim/src/Relay.cpp
index 1cbd8ce9ca..57a7a683d3 100644
--- a/wpilibc/sim/src/Relay.cpp
+++ b/wpilibc/sim/src/Relay.cpp
@@ -7,9 +7,8 @@
 
 #include "Relay.h"
 
-#include "MotorSafetyHelper.h"
-//#include "NetworkCommunication/UsageReporting.h"
 #include "LiveWindow/LiveWindow.h"
+#include "MotorSafetyHelper.h"
 #include "WPIErrors.h"
 
 /**
diff --git a/wpilibc/sim/src/RobotDrive.cpp b/wpilibc/sim/src/RobotDrive.cpp
index 0604cf412f..d93b04d940 100644
--- a/wpilibc/sim/src/RobotDrive.cpp
+++ b/wpilibc/sim/src/RobotDrive.cpp
@@ -6,7 +6,6 @@
 /*----------------------------------------------------------------------------*/
 
 #include "RobotDrive.h"
-//#include "CANJaguar.h"
 #include <math.h>
 #include "GenericHID.h"
 #include "Joystick.h"
diff --git a/wpilibc/sim/src/Talon.cpp b/wpilibc/sim/src/Talon.cpp
index 24221125a7..e25976f24b 100644
--- a/wpilibc/sim/src/Talon.cpp
+++ b/wpilibc/sim/src/Talon.cpp
@@ -7,7 +7,6 @@
 
 #include "Talon.h"
 
-//#include "NetworkCommunication/UsageReporting.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**
diff --git a/wpilibc/sim/src/Victor.cpp b/wpilibc/sim/src/Victor.cpp
index 571a9e0400..815dd6a05f 100644
--- a/wpilibc/sim/src/Victor.cpp
+++ b/wpilibc/sim/src/Victor.cpp
@@ -7,7 +7,6 @@
 
 #include "Victor.h"
 
-//#include "NetworkCommunication/UsageReporting.h"
 #include "LiveWindow/LiveWindow.h"
 
 /**
diff --git a/wpilibj/src/athena/cpp/lib/FRCNetworkCommunicationsLibrary.cpp b/wpilibj/src/athena/cpp/lib/FRCNetworkCommunicationsLibrary.cpp
index 4807ad3d91..46e79fa16c 100644
--- a/wpilibj/src/athena/cpp/lib/FRCNetworkCommunicationsLibrary.cpp
+++ b/wpilibj/src/athena/cpp/lib/FRCNetworkCommunicationsLibrary.cpp
@@ -11,8 +11,6 @@
 
 #include "HAL/HAL.h"
 #include "edu_wpi_first_wpilibj_communication_FRCNetworkCommunicationsLibrary.h"
-//#include "NetworkCommunication/FRCComm.h"
-//#include "NetworkCommunication/UsageReporting.h"
 #include "HALUtil.h"
 
 // set the logging level
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 11fab0a64a..14da664b0d 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.communication.UsageReporting;
 import edu.wpi.first.wpilibj.hal.AnalogJNI;
 import edu.wpi.first.wpilibj.util.BoundaryException;
 
-// import com.sun.jna.Pointer;
-
 /**
  * Class for creating and configuring Analog Triggers.
  *
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/can/CANJNI.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/can/CANJNI.java
index 5ed057e83c..e910e8bd5b 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/can/CANJNI.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/can/CANJNI.java
@@ -7,14 +7,6 @@
 
 package edu.wpi.first.wpilibj.can;
 
-// import com.ochafik.lang.jnaerator.runtime.LibraryExtractor;
-// import com.ochafik.lang.jnaerator.runtime.MangledFunctionMapper;
-// import com.sun.jna.Library;
-// import com.sun.jna.Native;
-// import com.sun.jna.NativeLibrary;
-// import com.sun.jna.Pointer;
-// import com.sun.jna.ptr.IntByReference;
-
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;