diff --git a/src/resources/commands/callbacks/WaypointCmdCallback.java b/src/resources/commands/callbacks/WaypointCmdCallback.java
index 55466c60d..e233e1d88 100644
--- a/src/resources/commands/callbacks/WaypointCmdCallback.java
+++ b/src/resources/commands/callbacks/WaypointCmdCallback.java
@@ -32,8 +32,6 @@ import resources.Location;
import resources.Terrain;
import resources.commands.ICmdCallback;
import resources.objects.SWGObject;
-import resources.objects.building.BuildingObject;
-import resources.objects.cell.CellObject;
import resources.objects.creature.CreatureObject;
import resources.objects.player.PlayerObject;
import resources.objects.waypoint.WaypointObject;
diff --git a/src/resources/objects/buildouts/SnapshotRow.java b/src/resources/objects/buildouts/SnapshotRow.java
deleted file mode 100644
index 28b3f845f..000000000
--- a/src/resources/objects/buildouts/SnapshotRow.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/***********************************************************************************
-* Copyright (c) 2015 /// Project SWG /// www.projectswg.com *
-* *
-* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
-* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
-* Our goal is to create an emulator which will provide a server for players to *
-* continue playing a game similar to the one they used to play. We are basing *
-* it on the final publish of the game prior to end-game events. *
-* *
-* This file is part of Holocore. *
-* *
-* -------------------------------------------------------------------------------- *
-* *
-* Holocore is free software: you can redistribute it and/or modify *
-* it under the terms of the GNU Affero General Public License as *
-* published by the Free Software Foundation, either version 3 of the *
-* License, or (at your option) any later version. *
-* *
-* Holocore is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU Affero General Public License for more details. *
-* *
-* You should have received a copy of the GNU Affero General Public License *
-* along with Holocore. If not, see . *
-* *
-***********************************************************************************/
-package resources.objects.buildouts;
-
-import resources.client_info.visitors.WorldSnapshotData.Node;
-
-public class SnapshotRow {
-
-
-
- public void load(Node node) {
-
- }
-
-}
diff --git a/src/resources/server_info/RelationalServerData.java b/src/resources/server_info/RelationalServerData.java
index 093bcb963..639c264aa 100644
--- a/src/resources/server_info/RelationalServerData.java
+++ b/src/resources/server_info/RelationalServerData.java
@@ -29,7 +29,6 @@ package resources.server_info;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.sql.PreparedStatement;
diff --git a/src/resources/sui/SuiBaseWindow.java b/src/resources/sui/SuiBaseWindow.java
index 05c1d0600..04b7535e5 100644
--- a/src/resources/sui/SuiBaseWindow.java
+++ b/src/resources/sui/SuiBaseWindow.java
@@ -122,7 +122,7 @@ public class SuiBaseWindow implements Encodable {
hasSubscriptionComponent = true;
}
- private void addDataSourceContainer(String dataSourceContainer, String name, String value) {
+ public final void addDataSourceContainer(String dataSourceContainer, String name, String value) {
SuiComponent component = new SuiComponent(SuiComponent.Type.ADD_DATA_SOURCE_CONTAINER, dataSourceContainer);
component.addNarrowParam(name);
@@ -201,7 +201,6 @@ public class SuiBaseWindow implements Encodable {
if (component.getType() != SuiComponent.Type.SUBSCRIBE_TO_EVENT)
continue;
- List narrowParams = component.getNarrowParams();
int eventType = component.getSubscribedToEventType();
if (eventType == event && component.getTarget().equals(widget))
diff --git a/src/services/chat/ChatRoomService.java b/src/services/chat/ChatRoomService.java
index ba8d1b1cf..535938198 100644
--- a/src/services/chat/ChatRoomService.java
+++ b/src/services/chat/ChatRoomService.java
@@ -78,7 +78,6 @@ import resources.server_info.ObjectDatabase;
import services.player.PlayerManager;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/src/services/galaxy/terminals/TerminalService.java b/src/services/galaxy/terminals/TerminalService.java
index b1faa26a0..0345835f4 100644
--- a/src/services/galaxy/terminals/TerminalService.java
+++ b/src/services/galaxy/terminals/TerminalService.java
@@ -5,7 +5,6 @@ import intents.radial.RadialRequestIntent;
import intents.radial.RadialResponseIntent;
import intents.radial.RadialSelectionIntent;
-import java.io.FileNotFoundException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
diff --git a/src/services/map/CityService.java b/src/services/map/CityService.java
index dc49cc591..5e3c50474 100644
--- a/src/services/map/CityService.java
+++ b/src/services/map/CityService.java
@@ -1,6 +1,5 @@
package services.map;
-import java.io.FileNotFoundException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
diff --git a/src/services/spawn/StaticService.java b/src/services/spawn/StaticService.java
index 46aa98c11..e9c157bbf 100644
--- a/src/services/spawn/StaticService.java
+++ b/src/services/spawn/StaticService.java
@@ -27,7 +27,6 @@
***********************************************************************************/
package services.spawn;
-import java.io.FileNotFoundException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
diff --git a/src/services/sui/SuiService.java b/src/services/sui/SuiService.java
index 0a17fe0ff..572d72646 100644
--- a/src/services/sui/SuiService.java
+++ b/src/services/sui/SuiService.java
@@ -29,7 +29,6 @@ package services.sui;
import intents.network.GalacticPacketIntent;
import intents.sui.SuiWindowIntent;
-import intents.sui.SuiWindowIntent.SuiWindowEvent;
import network.packets.Packet;
import network.packets.swg.SWGPacket;
import network.packets.swg.zone.server_ui.SuiCreatePageMessage;
diff --git a/src/utilities/IntentFactory.java b/src/utilities/IntentFactory.java
index 5d463bea5..e90d4df35 100644
--- a/src/utilities/IntentFactory.java
+++ b/src/utilities/IntentFactory.java
@@ -13,7 +13,6 @@ import resources.player.Player;
import intents.chat.ChatBroadcastIntent;
import intents.chat.ChatBroadcastIntent.BroadcastType;
import intents.chat.PersistentMessageIntent;
-import resources.sui.SuiBaseWindow;
import resources.sui.SuiWindow;
/**