diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java
index ad04e1fde..a5e567a34 100644
--- a/src/services/CoreManager.java
+++ b/src/services/CoreManager.java
@@ -56,6 +56,7 @@ import resources.control.Manager;
 import resources.control.ServerStatus;
 import resources.server_info.Config;
 import services.galaxy.GalacticManager;
+import utilities.ThreadUtilities;
 
 public class CoreManager extends Manager {
 	
@@ -71,7 +72,7 @@ public class CoreManager extends Manager {
 	private boolean packetDebug;
 	
 	public CoreManager() {
-		shutdownService = Executors.newSingleThreadScheduledExecutor();
+		shutdownService = Executors.newSingleThreadScheduledExecutor(ThreadUtilities.newThreadFactory("core-shutdown-service"));
 		shutdownRequested = false;
 		galaxy = getGalaxy();
 		if (galaxy != null) {
diff --git a/src/services/galaxy/WeatherService.java b/src/services/galaxy/WeatherService.java
index 872c1a5e3..cc5b1af66 100644
--- a/src/services/galaxy/WeatherService.java
+++ b/src/services/galaxy/WeatherService.java
@@ -44,6 +44,7 @@ import resources.control.Intent;
 import resources.control.Service;
 import resources.player.Player;
 import resources.player.PlayerEvent;
+import utilities.ThreadUtilities;
 
 public final class WeatherService extends Service {
 	
@@ -57,7 +58,7 @@ public final class WeatherService extends Service {
 	public WeatherService() {
 		cycleDuration = 600;	// Ziggy: 10 minutes, 600 seconds
 		terrains = Terrain.values();
-		executor = Executors.newScheduledThreadPool(terrains.length);
+		executor = Executors.newSingleThreadScheduledExecutor(ThreadUtilities.newThreadFactory("weather-service"));
 		weatherForTerrain = new HashMap<>();
 		weatherTypes = WeatherType.values();
 		random = new Random();
diff --git a/src/services/network/NetworkClientManager.java b/src/services/network/NetworkClientManager.java
index 5279a9d74..e1b9e9df0 100644
--- a/src/services/network/NetworkClientManager.java
+++ b/src/services/network/NetworkClientManager.java
@@ -58,7 +58,6 @@ import resources.control.Intent;
 import resources.control.Manager;
 import resources.network.ServerType;
 import resources.network.UDPServer.UDPPacket;
-import resources.server_info.Log;
 import utilities.ThreadUtilities;
 
 public class NetworkClientManager extends Manager implements PacketReceiver {
diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index aec2fe618..66097e77a 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -29,7 +29,6 @@ package services.objects;
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;