diff --git a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingCanvas.java b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingCanvas.java
index 29409e1..c36a195 100644
--- a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingCanvas.java
+++ b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwingCanvas.java
@@ -66,7 +66,6 @@
             pSwingRepaintManager = new PSwingRepaintManager();
             RepaintManager.setCurrentManager(pSwingRepaintManager);
         }
-        pSwingRepaintManager.addPSwingCanvas(this);
     }
 
     JComponent getSwingWrapper() {
@@ -81,7 +80,7 @@
         swingWrapper.remove(pSwing.getComponent());
     }
 
-    private static class SwingWrapper extends JComponent {
+    static class SwingWrapper extends JComponent {
         private PSwingCanvas pSwingCanvas;
 
         public SwingWrapper(PSwingCanvas pSwingCanvas) {
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 e0c4e72..72da218 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
@@ -70,7 +70,6 @@
  * @author Sam R. Reid
  */
 public class PSwingRepaintManager extends RepaintManager {
-    private ArrayList swingWrappers = new ArrayList();
 
     // The components that are currently painting
     // This needs to be a vector for thread safety
@@ -131,7 +130,7 @@
         // need to translate the repaint request since the component may
         // be offset inside another component.
         for (Component comp = c; comp != null && comp.isLightweight() && !captureRepaint; comp = comp.getParent()) {
-            if (swingWrappers.contains(comp.getParent())) {
+            if (comp.getParent() instanceof PSwingCanvas.SwingWrapper) {
                 if (comp instanceof JComponent) {
                     captureRepaint = true;
                     capturedComponent = (JComponent) comp;
@@ -195,8 +194,4 @@
             super.addInvalidComponent(invalidComponent);
         }
     }
-
-    void addPSwingCanvas(PSwingCanvas swingWrapper) {
-        swingWrappers.add(swingWrapper.getSwingWrapper());
-    }
 }
\ No newline at end of file