diff --git a/src/resources/spawn/Spawner.java b/src/resources/spawn/Spawner.java
index c9df4d978..7f9222b25 100644
--- a/src/resources/spawn/Spawner.java
+++ b/src/resources/spawn/Spawner.java
@@ -34,8 +34,7 @@ import resources.objects.custom.AIBehavior;
 
 public final class Spawner {
 
-	private static final Random RANDOM = new Random();
-	
+	private final Random random;
 	private final SWGObject spawnerObject;
 	private String creatureName;
 	private String[] iffTemplates;
@@ -51,6 +50,7 @@ public final class Spawner {
 	private String flagString;
 
 	public Spawner(SWGObject spawnerObject) {
+		random = new Random();
 		this.spawnerObject = spawnerObject;
 	}
 
@@ -61,7 +61,7 @@ public final class Spawner {
 	 * {@code maxRespawnDelay}
 	 */
 	public int getRespawnDelay() {
-		return RANDOM.nextInt((maxRespawnDelay - minRespawnDelay) + 1) + minRespawnDelay;
+		return random.nextInt((maxRespawnDelay - minRespawnDelay) + 1) + minRespawnDelay;
 	}
 	
 	/**
@@ -69,7 +69,7 @@ public final class Spawner {
 	 * @return 
 	 */
 	public String getRandomIffTemplate() {
-		return iffTemplates[RANDOM.nextInt(iffTemplates.length)];
+		return iffTemplates[random.nextInt(iffTemplates.length)];
 	}
 	
 	public SWGObject getSpawnerObject() {
diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java
index dd623d59a..31a3b8fdc 100644
--- a/src/services/combat/CorpseService.java
+++ b/src/services/combat/CorpseService.java
@@ -27,7 +27,6 @@
  ***********************************************************************************/
 package services.combat;
 
-import intents.PlayerEventIntent;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +36,6 @@ import intents.object.DestroyObjectIntent;
 import resources.control.Intent;
 import resources.control.Service;
 import resources.objects.creature.CreatureObject;
-import resources.player.Player;
 import resources.server_info.Log;
 import utilities.ThreadUtilities;
 
diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java
index ea2580ae9..659cbe2c3 100644
--- a/src/services/spawn/SpawnerService.java
+++ b/src/services/spawn/SpawnerService.java
@@ -139,8 +139,6 @@ public final class SpawnerService extends Service {
 				return;
 			}
 			
-			// TODO should some creatures not respawn?
-			
 			executorService.schedule(() -> spawnNPC(spawner), spawner.getRespawnDelay(), TimeUnit.SECONDS);
 		}
 	}