diff --git a/core/src/main/java/edu/umd/cs/piccolo/PCamera.java b/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
index 464e4d8..3b9a875 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/PCamera.java
@@ -33,7 +33,6 @@
 import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Dimension2D;
-import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
@@ -45,7 +44,6 @@
 
 import edu.umd.cs.piccolo.activities.PTransformActivity;
 import edu.umd.cs.piccolo.util.PAffineTransform;
-import edu.umd.cs.piccolo.util.PAffineTransformException;
 import edu.umd.cs.piccolo.util.PBounds;
 import edu.umd.cs.piccolo.util.PDebug;
 import edu.umd.cs.piccolo.util.PDimension;
diff --git a/core/src/main/java/edu/umd/cs/piccolo/nodes/PImage.java b/core/src/main/java/edu/umd/cs/piccolo/nodes/PImage.java
index 363cb9f..2204bb3 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/nodes/PImage.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/nodes/PImage.java
@@ -34,7 +34,6 @@
 import java.awt.Image;
 import java.awt.MediaTracker;
 import java.awt.Toolkit;
-import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/core/src/main/java/edu/umd/cs/piccolo/util/PPickPath.java b/core/src/main/java/edu/umd/cs/piccolo/util/PPickPath.java
index 6246bd4..b9dc6e2 100644
--- a/core/src/main/java/edu/umd/cs/piccolo/util/PPickPath.java
+++ b/core/src/main/java/edu/umd/cs/piccolo/util/PPickPath.java
@@ -29,7 +29,6 @@
 package edu.umd.cs.piccolo.util;
 
 import java.awt.geom.Dimension2D;
-import java.awt.geom.NoninvertibleTransformException;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.HashMap;
diff --git a/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java b/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java
index d73f075..94cce9c 100644
--- a/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java
+++ b/core/src/test/java/edu/umd/cs/piccolo/PCameraTest.java
@@ -32,7 +32,6 @@
 import java.awt.Cursor;
 import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
-import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 
@@ -40,10 +39,8 @@
 import edu.umd.cs.piccolo.activities.PActivity;
 import edu.umd.cs.piccolo.activities.PTransformActivity;
 import edu.umd.cs.piccolo.util.PAffineTransform;
-import edu.umd.cs.piccolo.util.PAffineTransformException;
 import edu.umd.cs.piccolo.util.PBounds;
 import edu.umd.cs.piccolo.util.PDebug;
-import edu.umd.cs.piccolo.util.PDimension;
 import edu.umd.cs.piccolo.util.PPaintContext;
 import edu.umd.cs.piccolo.util.PPickPath;
 
diff --git a/core/src/test/java/edu/umd/cs/piccolo/PLayerTest.java b/core/src/test/java/edu/umd/cs/piccolo/PLayerTest.java
index 7ba732e..41e7c42 100644
--- a/core/src/test/java/edu/umd/cs/piccolo/PLayerTest.java
+++ b/core/src/test/java/edu/umd/cs/piccolo/PLayerTest.java
@@ -1,17 +1,11 @@
 package edu.umd.cs.piccolo;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import junit.framework.TestCase;
 import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolo.util.PObjectOutputStream;
 
 public class PLayerTest extends TestCase {
 	private PLayer layer;
diff --git a/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java b/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java
index af4a8db..2d37142 100644
--- a/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java
+++ b/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java
@@ -1,6 +1,5 @@
 package edu.umd.cs.piccolo.event;
 
-import java.awt.Component;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 
diff --git a/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventTest.java b/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventTest.java
index 73ab24e..b2cf477 100644
--- a/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventTest.java
+++ b/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventTest.java
@@ -6,8 +6,6 @@
 
 import junit.framework.TestCase;
 import edu.umd.cs.piccolo.PCanvas;
-import edu.umd.cs.piccolo.util.PBounds;
-import edu.umd.cs.piccolo.util.PPickPath;
 
 public class PInputEventTest extends TestCase {
     private PCanvas canvas;
diff --git a/extras/src/main/java/edu/umd/cs/piccolox/event/PNavigationEventHandler.java b/extras/src/main/java/edu/umd/cs/piccolox/event/PNavigationEventHandler.java
index 670a959..352b822 100644
--- a/extras/src/main/java/edu/umd/cs/piccolox/event/PNavigationEventHandler.java
+++ b/extras/src/main/java/edu/umd/cs/piccolox/event/PNavigationEventHandler.java
@@ -260,7 +260,7 @@
             case WEST: {
                 return (nodeCenter.getX() < highlightCenter.getX())
                         && (nodeCenter.getY() > ytest1 && nodeCenter.getY() < ytest2);
-            }
+            }            
         }
         return false;
     }
diff --git a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingRepaintManager.java b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingRepaintManager.java
index 54906a1..1c46cb6 100644
--- a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingRepaintManager.java
+++ b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingRepaintManager.java
@@ -28,14 +28,15 @@
  */
 package edu.umd.cs.piccolox.pswing;
 
-import edu.umd.cs.piccolo.util.PBounds;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
+import java.awt.Component;
 import java.util.Vector;
 
+import javax.swing.JComponent;
+import javax.swing.RepaintManager;
+import javax.swing.SwingUtilities;
+
+import edu.umd.cs.piccolo.util.PBounds;
+
 /**
  * This RepaintManager replaces the default Swing implementation, and is used to
  * intercept and repaint dirty regions of PSwing components.