diff --git a/src/protocol/swg/chat/ChatPersistentMessageToClient.java b/src/protocol/swg/chat/ChatPersistentMessageToClient.java
index 6571d02d..0a13b280 100644
--- a/src/protocol/swg/chat/ChatPersistentMessageToClient.java
+++ b/src/protocol/swg/chat/ChatPersistentMessageToClient.java
@@ -26,12 +26,10 @@ import java.util.List;
 
 import org.apache.mina.core.buffer.IoBuffer;
 
-import engine.resources.common.StringUtilities;
 import protocol.swg.SWGMessage;
 import resources.common.ProsePackage;
 import services.chat.WaypointAttachment;
 
-
 public class ChatPersistentMessageToClient extends SWGMessage {
 	
 	private String sender;
diff --git a/src/resources/objects/factorycrate/FactoryCrateObject.java b/src/resources/objects/factorycrate/FactoryCrateObject.java
index 54f0a715..2f626d50 100644
--- a/src/resources/objects/factorycrate/FactoryCrateObject.java
+++ b/src/resources/objects/factorycrate/FactoryCrateObject.java
@@ -26,10 +26,7 @@ import java.util.Map;
 import java.util.Vector;
 
 import main.NGECore;
-import protocol.swg.SceneCreateObjectByCrc;
 import protocol.swg.SceneDestroyObject;
-import protocol.swg.SceneEndBaselines;
-import protocol.swg.UpdateContainmentMessage;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
@@ -42,7 +39,6 @@ import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 import resources.objects.ObjectMessageBuilder;
 import resources.objects.creature.CreatureObject;
-import resources.objects.resource.ResourceContainerObject;
 import resources.objects.tangible.TangibleObject;
 
 @Persistent(version=0)
diff --git a/src/services/chat/Mail.java b/src/services/chat/Mail.java
index 2cad7452..287bf83e 100644
--- a/src/services/chat/Mail.java
+++ b/src/services/chat/Mail.java
@@ -25,9 +25,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import resources.common.OutOfBand;
 import resources.common.ProsePackage;
-import engine.resources.common.Stf;
 import com.sleepycat.persist.model.Entity;
 import com.sleepycat.persist.model.PrimaryKey;
 
diff --git a/src/services/equipment/EquipmentService.java b/src/services/equipment/EquipmentService.java
index 2c2afb04..ca2949ad 100644
--- a/src/services/equipment/EquipmentService.java
+++ b/src/services/equipment/EquipmentService.java
@@ -48,7 +48,6 @@ import engine.resources.service.INetworkRemoteEvent;
 import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;
 import resources.objects.weapon.WeaponObject;
-import resources.skills.SkillMod;
 
 public class EquipmentService implements INetworkDispatch {
 	
diff --git a/src/services/playercities/PlayerCity.java b/src/services/playercities/PlayerCity.java
index 8d3f9f9e..168ab0b5 100644
--- a/src/services/playercities/PlayerCity.java
+++ b/src/services/playercities/PlayerCity.java
@@ -33,23 +33,15 @@ import java.util.concurrent.ConcurrentHashMap;
 import net.engio.mbassy.listener.Handler;
 import resources.common.OutOfBand;
 import resources.common.ProsePackage;
-import resources.common.collidables.AbstractCollidable;
 import resources.common.collidables.CollidableCircle;
 import resources.common.collidables.AbstractCollidable.EnterEvent;
 import resources.common.collidables.AbstractCollidable.ExitEvent;
 import resources.datatables.CivicStructures;
-import resources.datatables.Options;
 import resources.objects.building.BuildingObject;
 import resources.objects.creature.CreatureObject;
-import resources.objects.tangible.TangibleObject;
-import resources.objects.waypoint.WaypointObject;
 import services.chat.Mail;
-import services.chat.WaypointAttachment;
 import main.NGECore;
-import engine.clientdata.ClientFileManager;
 import engine.clientdata.StfTable;
-import engine.clientdata.visitors.DatatableVisitor;
-import engine.resources.common.CRC;
 import engine.resources.objects.SWGObject;
 import engine.resources.scene.Point3D;
 
diff --git a/src/services/playercities/PlayerCityService.java b/src/services/playercities/PlayerCityService.java
index b89faa24..99be0694 100644
--- a/src/services/playercities/PlayerCityService.java
+++ b/src/services/playercities/PlayerCityService.java
@@ -21,7 +21,6 @@
  ******************************************************************************/
 package services.playercities;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
 import java.util.Random;
@@ -33,7 +32,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import resources.common.OutOfBand;
-import resources.common.ProsePackage;
 import resources.datatables.Citizenship;
 import resources.objects.building.BuildingObject;
 import resources.objects.creature.CreatureObject;
diff --git a/src/services/reverseengineering/ReverseEngineeringService.java b/src/services/reverseengineering/ReverseEngineeringService.java
index a3a400e6..ad9e44b8 100644
--- a/src/services/reverseengineering/ReverseEngineeringService.java
+++ b/src/services/reverseengineering/ReverseEngineeringService.java
@@ -28,14 +28,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Vector;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 
 import resources.datatables.Options;
 import resources.objects.creature.CreatureObject;
 import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;
-import services.travel.TravelPoint;
 import engine.resources.container.Traverser;
 import engine.resources.objects.SWGObject;
 import engine.resources.service.INetworkDispatch;