diff --git a/src/main/java/com/dfsek/terra/TerraWorld.java b/src/main/java/com/dfsek/terra/TerraWorld.java
index 635650c41..ad6718f29 100644
--- a/src/main/java/com/dfsek/terra/TerraWorld.java
+++ b/src/main/java/com/dfsek/terra/TerraWorld.java
@@ -18,7 +18,7 @@ import java.util.Map;
 public class TerraWorld {
     private static Map<World, TerraWorld> map = new HashMap<>();
     private final TerraBiomeGrid grid;
-    private BiomeZone zone;
+    private final BiomeZone zone;
     private final TerraConfig config;
     private final WorldConfig worldConfig;
     private static final Object lock = new Object();
@@ -70,4 +70,8 @@ public class TerraWorld {
     public BiomeZone getZone() {
         return zone;
     }
+
+    public static void invalidate() {
+        map.clear();
+    }
 }
diff --git a/src/main/java/com/dfsek/terra/config/TerraConfig.java b/src/main/java/com/dfsek/terra/config/TerraConfig.java
index 7685f2c95..9a0b0ab1b 100644
--- a/src/main/java/com/dfsek/terra/config/TerraConfig.java
+++ b/src/main/java/com/dfsek/terra/config/TerraConfig.java
@@ -1,13 +1,7 @@
 package com.dfsek.terra.config;
 
-import com.dfsek.terra.biome.BiomeZone;
-import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.biome.UserDefinedBiome;
-import com.dfsek.terra.biome.UserDefinedGrid;
 import com.dfsek.terra.carving.UserDefinedCarver;
-import com.dfsek.terra.command.TerraCommand;
-import com.dfsek.terra.config.base.ConfigUtil;
-import com.dfsek.terra.config.base.WorldConfig;
 import com.dfsek.terra.config.exception.ConfigException;
 import com.dfsek.terra.config.genconfig.AbstractBiomeConfig;
 import com.dfsek.terra.config.genconfig.BiomeConfig;
@@ -18,14 +12,11 @@ import com.dfsek.terra.config.genconfig.OreConfig;
 import com.dfsek.terra.config.genconfig.PaletteConfig;
 import com.dfsek.terra.config.genconfig.StructureConfig;
 import org.bukkit.Bukkit;
-import org.bukkit.World;
 import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -47,9 +38,6 @@ public class TerraConfig extends YamlConfiguration {
     private final Map<String, BiomeGridConfig> grids;
     private final File dataFolder;
 
-    private final Map<World, TerraBiomeGrid> grid = new HashMap<>();
-    private final Map<World, BiomeZone> zones = new HashMap<>();
-
     private final String id;
 
     public List<String> biomeList;
@@ -101,14 +89,6 @@ public class TerraConfig extends YamlConfiguration {
         configs.put(id, this);
     }
 
-    public Map<String, OreConfig> getOres() {
-        return ores;
-    }
-
-    public Map<String, PaletteConfig> getPalettes() {
-        return palettes;
-    }
-
     public Map<String, AbstractBiomeConfig> getAbstractBiomes() {
         return abstractBiomes;
     }
@@ -117,26 +97,10 @@ public class TerraConfig extends YamlConfiguration {
         return biomes;
     }
 
-    public Map<String, BiomeGridConfig> getGrids() {
-        return grids;
-    }
-
     public Map<String, CarverConfig> getCarvers() {
         return carvers;
     }
 
-    public Map<String, FloraConfig> getFlora() {
-        return flora;
-    }
-
-    public Map<String, StructureConfig> getStructures() {
-        return structures;
-    }
-
-    public static Map<String, TerraConfig> getConfigs() {
-        return configs;
-    }
-
     public static void loadAll(JavaPlugin main) {
         configs.clear();
         List<Path> subfolder;
diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java b/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java
index eb05693eb..69ba1577e 100644
--- a/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java
+++ b/src/main/java/com/dfsek/terra/config/base/ConfigUtil.java
@@ -1,5 +1,6 @@
 package com.dfsek.terra.config.base;
 
+import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.biome.BiomeZone;
 import com.dfsek.terra.biome.TerraBiomeGrid;
 import com.dfsek.terra.config.ConfigLoader;
@@ -44,6 +45,8 @@ public final class ConfigUtil {
         logger.info("Loading config values");
 
         TerraConfig.loadAll(main);
+        TerraWorld.invalidate();
+        TerraWorld.invalidate();
     }
 
     public static <E extends Enum<E>> List<E> getElements(List<String> st, Class<E> clazz) {