diff --git a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
index 3016f811..509d7102 100644
--- a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
+++ b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapPlugin.java
@@ -1898,7 +1898,6 @@ public class DynmapPlugin
         File f = new File(core.getDataFolder(), "forgeworlds.yml");
         if(f.canRead() == false) {
             useSaveFolder = true;
-            ForgeWorld.setSaveFolderMapping();
             return;
         }
         ConfigurationNode cn = new ConfigurationNode(f);
@@ -1910,9 +1909,6 @@ public class DynmapPlugin
         if (cn.containsKey("useSaveFolderAsName")) {
             useSaveFolder = cn.getBoolean("useSaveFolderAsName", useSaveFolder);
         }
-    	if (useSaveFolder) {
-            ForgeWorld.setSaveFolderMapping();
-        }
         List<Map<String,Object>> lst = cn.getMapList("worlds");
         if(lst == null) {
             Log.warning("Discarding bad forgeworlds.yml");
diff --git a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/ForgeWorld.java b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/ForgeWorld.java
index c4b66446..4e3b4ab1 100644
--- a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/ForgeWorld.java
+++ b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/ForgeWorld.java
@@ -1,16 +1,12 @@
 package org.dynmap.forge_1_16_1;
-import java.io.File;
 /**
  * Forge specific implementation of DynmapWorld
  */
 import java.util.List;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.util.RegistryKey;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.gen.Heightmap.Type;
-import net.minecraft.world.server.ServerWorld;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.LightType;
 import net.minecraft.world.World;
@@ -30,12 +26,8 @@ public class ForgeWorld extends DynmapWorld
     private final boolean istheend;
     private final String env;
     private DynmapLocation spawnloc = new DynmapLocation();
-    private static boolean doSaveFolderMapping = false;
     private static int maxWorldHeight = 256;    // Maximum allows world height
     
-    public static void setSaveFolderMapping() {
-        doSaveFolderMapping = true;
-    }
     public static int getMaxWorldHeight() {
         return maxWorldHeight;
     }