diff --git a/src/main/as/com/threerings/bureau/client/BureauService.as b/src/main/as/com/threerings/bureau/client/BureauService.as
index 7c050d863..0afadfe39 100644
--- a/src/main/as/com/threerings/bureau/client/BureauService.as
+++ b/src/main/as/com/threerings/bureau/client/BureauService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.bureau.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**
diff --git a/src/main/as/com/threerings/bureau/data/BureauMarshaller.as b/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
index 96e08e20e..137634b95 100644
--- a/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
+++ b/src/main/as/com/threerings/bureau/data/BureauMarshaller.as
@@ -22,7 +22,6 @@
 package com.threerings.bureau.data {
 
 import com.threerings.bureau.client.BureauService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.Integer;
 
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as b/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
index 0d9c16508..14eb88cb9 100644
--- a/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
+++ b/src/main/as/com/threerings/crowd/chat/client/ChannelSpeakService.as
@@ -22,7 +22,6 @@
 package com.threerings.crowd.chat.client {
 
 import com.threerings.crowd.chat.data.ChatChannel;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**
diff --git a/src/main/as/com/threerings/crowd/chat/client/ChatService.as b/src/main/as/com/threerings/crowd/chat/client/ChatService.as
index 58af2cb55..eabeceea3 100644
--- a/src/main/as/com/threerings/crowd/chat/client/ChatService.as
+++ b/src/main/as/com/threerings/crowd/chat/client/ChatService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.chat.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.util.Name;
diff --git a/src/main/as/com/threerings/crowd/chat/client/SpeakService.as b/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
index 638989e98..fdef7c114 100644
--- a/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
+++ b/src/main/as/com/threerings/crowd/chat/client/SpeakService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.chat.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
index b9d435ba2..4b5993413 100644
--- a/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
+++ b/src/main/as/com/threerings/crowd/chat/data/ChannelSpeakMarshaller.as
@@ -22,7 +22,6 @@
 package com.threerings.crowd.chat.data {
 
 import com.threerings.crowd.chat.client.ChannelSpeakService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.Byte;
 
diff --git a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
index 8291ba247..2642dd036 100644
--- a/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
+++ b/src/main/as/com/threerings/crowd/chat/data/ChatMarshaller.as
@@ -23,7 +23,6 @@ package com.threerings.crowd.chat.data {
 
 import com.threerings.crowd.chat.client.ChatService;
 import com.threerings.crowd.chat.client.ChatService_TellListener;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
diff --git a/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as b/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
index 81a84be6b..ee05f92cd 100644
--- a/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
+++ b/src/main/as/com/threerings/crowd/chat/data/SpeakMarshaller.as
@@ -22,7 +22,6 @@
 package com.threerings.crowd.chat.data {
 
 import com.threerings.crowd.chat.client.SpeakService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.Byte;
 
diff --git a/src/main/as/com/threerings/crowd/client/BodyService.as b/src/main/as/com/threerings/crowd/client/BodyService.as
index a801cc9d6..c40613759 100644
--- a/src/main/as/com/threerings/crowd/client/BodyService.as
+++ b/src/main/as/com/threerings/crowd/client/BodyService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**
diff --git a/src/main/as/com/threerings/crowd/client/LocationService.as b/src/main/as/com/threerings/crowd/client/LocationService.as
index 1fca18320..6bc13911a 100644
--- a/src/main/as/com/threerings/crowd/client/LocationService.as
+++ b/src/main/as/com/threerings/crowd/client/LocationService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.crowd.client {
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**
diff --git a/src/main/as/com/threerings/crowd/data/BodyMarshaller.as b/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
index c29a011d9..11997e05e 100644
--- a/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
+++ b/src/main/as/com/threerings/crowd/data/BodyMarshaller.as
@@ -22,7 +22,6 @@
 package com.threerings.crowd.data {
 
 import com.threerings.crowd.client.BodyService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.langBoolean;
 
diff --git a/src/main/as/com/threerings/crowd/data/LocationMarshaller.as b/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
index ceddf9b7c..4803bea1c 100644
--- a/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
+++ b/src/main/as/com/threerings/crowd/data/LocationMarshaller.as
@@ -23,7 +23,6 @@ package com.threerings.crowd.data {
 
 import com.threerings.crowd.client.LocationService;
 import com.threerings.crowd.client.LocationService_MoveListener;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.Integer;
 
diff --git a/src/main/as/com/threerings/presents/client/TimeBaseService.as b/src/main/as/com/threerings/presents/client/TimeBaseService.as
index 95c4d7f5f..597d70035 100644
--- a/src/main/as/com/threerings/presents/client/TimeBaseService.as
+++ b/src/main/as/com/threerings/presents/client/TimeBaseService.as
@@ -21,7 +21,6 @@
 
 package com.threerings.presents.client {
 
-
 /**
  * An ActionScript version of the Java TimeBaseService interface.
  */
diff --git a/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as b/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
index 7d0f6413f..9b34b9d0b 100644
--- a/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
+++ b/src/main/as/com/threerings/presents/client/TimeBaseService_GotTimeBaseListener.as
@@ -21,7 +21,6 @@
 
 package com.threerings.presents.client {
 
-
 /**
  * An ActionScript version of the Java TimeBaseService_GotTimeBaseListener interface.
  */
diff --git a/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as b/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
index af592d3c0..0cd1d79a5 100644
--- a/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
+++ b/src/main/as/com/threerings/presents/data/TimeBaseMarshaller.as
@@ -21,7 +21,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;
 
diff --git a/src/test/java/com/threerings/presents/data/TestMarshaller.java b/src/test/java/com/threerings/presents/data/TestMarshaller.java
index d2e51e671..10a36994c 100644
--- a/src/test/java/com/threerings/presents/data/TestMarshaller.java
+++ b/src/test/java/com/threerings/presents/data/TestMarshaller.java
@@ -21,11 +21,11 @@
 
 package com.threerings.presents.data;
 
+import java.util.List;
 import javax.annotation.Generated;
 
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.TestService;
-import java.util.List;
 
 /**
  * Provides the implementation of the {@link TestService} interface
diff --git a/src/test/java/com/threerings/presents/server/TestProvider.java b/src/test/java/com/threerings/presents/server/TestProvider.java
index 7defcc7eb..7761e5c73 100644
--- a/src/test/java/com/threerings/presents/server/TestProvider.java
+++ b/src/test/java/com/threerings/presents/server/TestProvider.java
@@ -21,12 +21,12 @@
 
 package com.threerings.presents.server;
 
+import java.util.List;
 import javax.annotation.Generated;
 
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.TestService;
 import com.threerings.presents.data.ClientObject;
-import java.util.List;
 
 /**
  * Defines the server-side of the {@link TestService}.