diff --git a/src/nl/tue/id/oocsi/OOCSI.java b/src/nl/tue/id/oocsi/OOCSI.java
index 37f95cf..6d980bb 100644
--- a/src/nl/tue/id/oocsi/OOCSI.java
+++ b/src/nl/tue/id/oocsi/OOCSI.java
@@ -1,6 +1,5 @@
 package nl.tue.id.oocsi;
 
-import nl.tue.id.oocsi.client.OOCSICommunicator;
 import nl.tue.id.oocsi.client.protocol.OOCSIMessage;
 import processing.core.PApplet;
 
diff --git a/test/channel/TestChannelReceiver.java b/test/channel/TestChannelReceiver.java
index 7446547..ee7af42 100644
--- a/test/channel/TestChannelReceiver.java
+++ b/test/channel/TestChannelReceiver.java
@@ -1,7 +1,7 @@
 package channel;
 
 import nl.tue.id.oocsi.OOCSI;
-import nl.tue.id.oocsi.client.protocol.OOCSIEvent;
+import nl.tue.id.oocsi.OOCSIEvent;
 import processing.core.PApplet;
 
 /**
diff --git a/test/direct/TestDirectReceiver.java b/test/direct/TestDirectReceiver.java
index f2df0e0..ca5c9c0 100644
--- a/test/direct/TestDirectReceiver.java
+++ b/test/direct/TestDirectReceiver.java
@@ -1,7 +1,7 @@
 package direct;
 
 import nl.tue.id.oocsi.OOCSI;
-import nl.tue.id.oocsi.client.protocol.OOCSIEvent;
+import nl.tue.id.oocsi.OOCSIEvent;
 import processing.core.PApplet;
 
 @SuppressWarnings("serial")