diff --git a/src/main/java/us/tastybento/bskyblock/config/PluginConfig.java b/src/main/java/us/tastybento/bskyblock/config/PluginConfig.java
index 1319e5650..46a48f148 100644
--- a/src/main/java/us/tastybento/bskyblock/config/PluginConfig.java
+++ b/src/main/java/us/tastybento/bskyblock/config/PluginConfig.java
@@ -5,7 +5,6 @@ import java.util.HashMap;
 import us.tastybento.bskyblock.BSkyBlock;
 import us.tastybento.bskyblock.config.NotSetup.ConfigError;
 import us.tastybento.bskyblock.database.BSBDatabase.DatabaseType;
-import us.tastybento.bskyblock.database.objects.Island.SettingsFlag;
 
 /**
  * Loads the plugin configuration and the locales.
@@ -116,11 +115,6 @@ public class PluginConfig {
         Settings.endIslands = false;
         Settings.limitedBlocks = new HashMap<>();
         Settings.defaultWorldSettings = new HashMap<>();
-        for (SettingsFlag flag: SettingsFlag.values()) {
-            Settings.defaultWorldSettings.put(flag, false);
-        }
-        Settings.defaultWorldSettings.put(SettingsFlag.ANIMAL_SPAWN, true);
-        Settings.defaultWorldSettings.put(SettingsFlag.MONSTER_SPAWN, true);
 
         // Team
         Settings.maxTeamSize = plugin.getConfig().getInt("island.max-team-size", 4);
diff --git a/src/main/java/us/tastybento/bskyblock/config/Settings.java b/src/main/java/us/tastybento/bskyblock/config/Settings.java
index 1e0c8715b..0c13079f0 100755
--- a/src/main/java/us/tastybento/bskyblock/config/Settings.java
+++ b/src/main/java/us/tastybento/bskyblock/config/Settings.java
@@ -8,8 +8,8 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffectType;
 
+import us.tastybento.bskyblock.api.flags.Flag;
 import us.tastybento.bskyblock.database.BSBDatabase.DatabaseType;
-import us.tastybento.bskyblock.database.objects.Island.SettingsFlag;
 
 /**
  * All the plugin settings are here
@@ -166,7 +166,7 @@ public class Settings {
 
     public static boolean endIslands;
 
-    public static HashMap<SettingsFlag, Boolean> defaultWorldSettings;
+    public static HashMap<Flag, Boolean> defaultWorldSettings;
     public static boolean allowEndermanGriefing;
     public static boolean endermanDeathDrop;
     public static boolean allowTNTDamage;