diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml
index 7f6b2dd59..0814d2387 100644
--- a/Plugins/.idea/codeStyleSettings.xml
+++ b/Plugins/.idea/codeStyleSettings.xml
@@ -6,6 +6,20 @@
         <option name="FIELD_NAME_PREFIX" value="_" />
         <option name="STATIC_FIELD_NAME_PREFIX" value="_" />
         <option name="USE_SINGLE_CLASS_IMPORTS" value="false" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="javax" withSubpackages="true" static="false" />
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org.bukkit" withSubpackages="true" static="false" />
+            <package name="net.minecraft" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+            <package name="" withSubpackages="true" static="true" />
+          </value>
+        </option>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
diff --git a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapData.java b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapData.java
index 1217b9f39..db49e836e 100644
--- a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapData.java
+++ b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapData.java
@@ -19,14 +19,12 @@ public class MapData
 	public String MapName = "null";
 	public String MapCreator = "null";
 
-	public HashSet<String> WhiteList;
 	public HashSet<String> BuildList;
 	
 	public MapData(String mapFolder)
 	{
 		MapFolder = mapFolder;
 
-		WhiteList = new HashSet<String>();
 		BuildList = new HashSet<String>();
 		
 		if ((new File(MapFolder + File.separator + "Map.dat")).exists())
@@ -68,11 +66,6 @@ public class MapData
 				{
 					GameType = GameType.valueOf(tokens[1] == null ? "Null" : tokens[1]);
 				}
-				else if (tokens[0].equalsIgnoreCase("WHITE_LIST"))
-				{
-					for (String cur : tokens[1].split(","))
-						WhiteList.add(cur);
-				}
 				else if (tokens[0].equalsIgnoreCase("BUILD_LIST"))
 				{
 					for (String cur : tokens[1].split(","))
@@ -103,13 +96,6 @@ public class MapData
 			out.write("\n");
 			out.write("GAME_TYPE:"+GameType);
 			
-			String whiteList = "";
-			for (String cur : WhiteList)
-				whiteList += cur + ",";
-			
-			out.write("\n");
-			out.write("WHITE_LIST:"+whiteList);
-			
 			String buildList = "";
 			for (String cur : BuildList)
 				buildList += cur + ",";
@@ -132,7 +118,7 @@ public class MapData
 	
 	public boolean CanJoin(Player player) 
 	{
-		return BuildList.contains(player.getName()) || WhiteList.contains(player.getName()) || player.isOp();
+		return true;
 	}
 
 	public boolean CanRename(Player player)