diff --git a/src/as/com/threerings/crowd/chat/client/ChatService.as b/src/as/com/threerings/crowd/chat/client/ChatService.as
index f07417ee3..913b20e46 100644
--- a/src/as/com/threerings/crowd/chat/client/ChatService.as
+++ b/src/as/com/threerings/crowd/chat/client/ChatService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.chat.client {
 
-import com.threerings.crowd.chat.client.ChatService_TellListener;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_InvocationListener;
diff --git a/src/as/com/threerings/crowd/chat/client/ChatService_TellListener.as b/src/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
index 3564dcfe2..9e40515e2 100644
--- a/src/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
+++ b/src/as/com/threerings/crowd/chat/client/ChatService_TellListener.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.chat.client {
 
-import com.threerings.crowd.chat.client.ChatService_TellListener;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.util.Long;
 
diff --git a/src/as/com/threerings/crowd/client/LocationService.as b/src/as/com/threerings/crowd/client/LocationService.as
index 45d6e3aff..d804e0f03 100644
--- a/src/as/com/threerings/crowd/client/LocationService.as
+++ b/src/as/com/threerings/crowd/client/LocationService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.client {
 
-import com.threerings.crowd.client.LocationService_MoveListener;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
diff --git a/src/as/com/threerings/crowd/client/LocationService_MoveListener.as b/src/as/com/threerings/crowd/client/LocationService_MoveListener.as
index 062a49c8b..69a3cd654 100644
--- a/src/as/com/threerings/crowd/client/LocationService_MoveListener.as
+++ b/src/as/com/threerings/crowd/client/LocationService_MoveListener.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.client {
 
-import com.threerings.crowd.client.LocationService_MoveListener;
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 
diff --git a/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as b/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
index df428aad3..65ba86eec 100644
--- a/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
+++ b/src/as/com/threerings/crowd/data/LocationMarshaller_MoveMarshaller.as
@@ -22,7 +22,6 @@
 package com.threerings.crowd.data {
 
 import com.threerings.crowd.client.LocationService_MoveListener;
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 
 /**
diff --git a/src/as/com/threerings/presents/client/TimeBaseService.as b/src/as/com/threerings/presents/client/TimeBaseService.as
index 2310df0c4..cf7e2931b 100644
--- a/src/as/com/threerings/presents/client/TimeBaseService.as
+++ b/src/as/com/threerings/presents/client/TimeBaseService.as
@@ -21,9 +21,6 @@
 
 package com.threerings.presents.client {
 
-import com.threerings.presents.client.Client;
-import com.threerings.presents.client.InvocationService;
-import com.threerings.presents.client.TimeBaseService_GotTimeBaseListener;
 
 /**
  * An ActionScript version of the Java TimeBaseService interface.
diff --git a/src/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as b/src/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
index b81c7b296..34f3b1dbe 100644
--- a/src/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
+++ b/src/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
@@ -21,8 +21,6 @@
 
 package com.threerings.presents.client {
 
-import com.threerings.presents.client.InvocationService_InvocationListener;
-import com.threerings.presents.client.TimeBaseService_GotTimeBaseListener;
 
 /**
  * An ActionScript version of the Java TimeBaseService_GotTimeBaseListener interface.
diff --git a/src/as/com/threerings/presents/data/TimeBaseMarshaller.as b/src/as/com/threerings/presents/data/TimeBaseMarshaller.as
index f12906a96..da1c9de82 100644
--- a/src/as/com/threerings/presents/data/TimeBaseMarshaller.as
+++ b/src/as/com/threerings/presents/data/TimeBaseMarshaller.as
@@ -24,7 +24,6 @@ package com.threerings.presents.data {
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.TimeBaseService;
 import com.threerings.presents.client.TimeBaseService_GotTimeBaseListener;
-import com.threerings.presents.data.InvocationMarshaller;
 
 /**
  * Provides the implementation of the {@link TimeBaseService} interface
diff --git a/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as b/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
index 573c09b6d..146f3dd00 100644
--- a/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
+++ b/src/as/com/threerings/presents/data/TimeBaseMarshaller_GotTimeBaseMarshaller.as
@@ -22,7 +22,6 @@
 package com.threerings.presents.data {
 
 import com.threerings.presents.client.TimeBaseService_GotTimeBaseListener;
-import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 
 /**
  * Marshalls instances of the TimeBaseService_GotTimeBaseMarshaller interface.
diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/java/com/threerings/admin/data/AdminMarshaller.java
index 6ef3cc198..ae72c4269 100644
--- a/src/java/com/threerings/admin/data/AdminMarshaller.java
+++ b/src/java/com/threerings/admin/data/AdminMarshaller.java
@@ -22,7 +22,6 @@
 package com.threerings.admin.data;
 
 import com.threerings.admin.client.AdminService;
-import com.threerings.admin.data.AdminMarshaller;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
diff --git a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
index 048a5527a..01444ab4e 100644
--- a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
+++ b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
@@ -22,7 +22,6 @@
 package com.threerings.crowd.chat.data;
 
 import com.threerings.crowd.chat.client.ChatService;
-import com.threerings.crowd.chat.data.ChatMarshaller;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
diff --git a/src/java/com/threerings/crowd/data/LocationMarshaller.java b/src/java/com/threerings/crowd/data/LocationMarshaller.java
index 25c4a3589..cbdea3278 100644
--- a/src/java/com/threerings/crowd/data/LocationMarshaller.java
+++ b/src/java/com/threerings/crowd/data/LocationMarshaller.java
@@ -22,8 +22,6 @@
 package com.threerings.crowd.data;
 
 import com.threerings.crowd.client.LocationService;
-import com.threerings.crowd.data.LocationMarshaller;
-import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
diff --git a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
index 07255cc7b..659224a14 100644
--- a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
+++ b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
@@ -23,8 +23,6 @@ package com.threerings.presents.data;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.TimeBaseService;
-import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.data.TimeBaseMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
 
 /**
diff --git a/src/java/com/threerings/presents/peer/data/PeerMarshaller.java b/src/java/com/threerings/presents/peer/data/PeerMarshaller.java
index 1c3b32223..181500e5b 100644
--- a/src/java/com/threerings/presents/peer/data/PeerMarshaller.java
+++ b/src/java/com/threerings/presents/peer/data/PeerMarshaller.java
@@ -24,7 +24,6 @@ package com.threerings.presents.peer.data;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.peer.client.PeerService;
-import com.threerings.presents.peer.data.NodeObject;
 
 /**
  * Provides the implementation of the {@link PeerService} interface
diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
index 49d8e9596..378694fe6 100644
--- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
+++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
@@ -25,8 +25,6 @@ import com.threerings.presents.client.TimeBaseService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.TimeBaseMarshaller;
-import com.threerings.presents.server.InvocationDispatcher;
-import com.threerings.presents.server.InvocationException;
 
 /**
  * Dispatches requests to the {@link TimeBaseProvider}.