diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
index a3a39aefb..799c1a7c7 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
@@ -1247,19 +1247,9 @@ public class Config
 							.comment("Render LOD section status?")
 							.build();
 					
-					public static ConfigEntry<Boolean> showFullDataFileStatus = new ConfigEntry.Builder<Boolean>()
+					public static ConfigEntry<Boolean> showFullDataUpdateStatus = new ConfigEntry.Builder<Boolean>()
 							.set(false)
-							.comment("Render full data file status?")
-							.build();
-					
-					public static ConfigEntry<Boolean> showFullDataFileSampling = new ConfigEntry.Builder<Boolean>()
-							.set(false)
-							.comment("Render full data file sampling progress?")
-							.build();
-					
-					public static ConfigEntry<Boolean> showRenderDataFileStatus = new ConfigEntry.Builder<Boolean>()
-							.set(false)
-							.comment("Render render data file status?")
+							.comment("Render full data update/lock status?")
 							.build();
 					
 				}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/NewFullDataFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/NewFullDataFileHandler.java
index ad3e708aa..913c94541 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/NewFullDataFileHandler.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/NewFullDataFileHandler.java
@@ -79,7 +79,7 @@ public class NewFullDataFileHandler
 	{
 		super(level, saveStructure, saveDirOverride);
 		
-		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataFileStatus);
+		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
 		
 		String dimensionName = level.getLevelWrapper().getDimensionType().getDimensionName();
 		this.updateQueueProcessor = ThreadUtil.makeSingleThreadPool("Parent Update Queue ["+dimensionName+"]");
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
index cd8c87f08..f1184a609 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
@@ -575,8 +575,6 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 		LodUtil.assertTrue(this.generatorClosingFuture != null);
 		
 		
-		
-		
 		LOGGER.info("Awaiting world generator thread pool termination...");
 		try
 		{
@@ -593,9 +591,8 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 		}
 		
 		
-		
 		this.generator.close();
-		
+		DebugRenderer.unregister(this, Config.Client.Advanced.Debugging.DebugWireframe.showWorldGenQueue);
 		
 		
 		try
@@ -606,8 +603,9 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 		{
 			LOGGER.warn("Failed to close generation queue: ", e);
 		}
+		
+		
 		LOGGER.info("Finished closing " + WorldGenerationQueue.class.getSimpleName());
-		DebugRenderer.unregister(this, Config.Client.Advanced.Debugging.DebugWireframe.showWorldGenQueue);
 	}
 	
 	
diff --git a/core/src/main/resources/assets/distanthorizons/lang/en_us.json b/core/src/main/resources/assets/distanthorizons/lang/en_us.json
index f581ea4aa..2f1867f4b 100644
--- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json
+++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json
@@ -558,12 +558,8 @@
     "Show World Gen Queue",
   "distanthorizons.config.client.advanced.debugging.debugWireframe.showRenderSectionStatus":
     "Show Render Section Status",
-  "distanthorizons.config.client.advanced.debugging.debugWireframe.showFullDataFileStatus":
-    "Show Full Data file Status",
-  "distanthorizons.config.client.advanced.debugging.debugWireframe.showFullDataFileSampling":
-    "Show Full Data file Sampling",
-  "distanthorizons.config.client.advanced.debugging.debugWireframe.showRenderDataFileStatus":
-    "Show Render Data file Status",
+  "distanthorizons.config.client.advanced.debugging.debugWireframe.showFullDataUpdateStatus":
+    "Show Full Data Update Status",
 
 
   "distanthorizons.config.client.advanced.debugging.openGl":