diff --git a/src/services/admin/WebserverHandler.java b/src/services/admin/WebserverHandler.java
index c39b71b23..594e3631f 100644
--- a/src/services/admin/WebserverHandler.java
+++ b/src/services/admin/WebserverHandler.java
@@ -17,14 +17,12 @@ import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import resources.Location;
 import resources.objects.SWGObject;
-import resources.objects.building.BuildingObject;
 import resources.objects.cell.CellObject;
 import resources.player.Player;
 import resources.server_info.Log;
diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java
index ff89f6bbd..b4b594671 100644
--- a/src/services/spawn/SpawnerService.java
+++ b/src/services/spawn/SpawnerService.java
@@ -58,7 +58,7 @@ public final class SpawnerService extends Service {
 	public boolean initialize() {
 		registerForIntent(ConfigChangedIntent.TYPE);
 		
-		if (getConfig(ConfigFile.FEATURES).getBoolean("SPAWNERS-ENABLED", true))
+		if (getConfig(ConfigFile.FEATURES).getBoolean("SPAWNERS-ENABLED", false))
 			loadEggs();
 		
 		return super.initialize();