diff --git a/src/core/BaseLocFile.java b/src/core/BaseLocFile.java
index eca8e2e..6b9982f 100644
--- a/src/core/BaseLocFile.java
+++ b/src/core/BaseLocFile.java
@@ -169,7 +169,6 @@ public abstract class BaseLocFile implements IConfigSection
 	@Override
 	public void consume(List<ConfigItem> pairs)
 	{
-		GlobalLog.log("Ok nice!");
 		localized.clear();
 		buildLocalized(pairs);
 		scrapeAll();
diff --git a/src/core/CommandEnabler.java b/src/core/CommandEnabler.java
index 3eec255..71eb4d4 100644
--- a/src/core/CommandEnabler.java
+++ b/src/core/CommandEnabler.java
@@ -5,7 +5,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
-import dataStructures.Pair;
 import utils.GlobalLog;
 import utils.LogFilter;
 
@@ -50,6 +49,9 @@ public class CommandEnabler implements IConfigSection
 	// Reads in the config file and parses it, keeping tabs on the order it read things
 	private void readIn(List<ConfigItem> items)
 	{
+		keyList.clear();
+		enabledMap.clear();
+		
 		for(ConfigItem item : items)
 		{
 			String key = item.key;
@@ -90,7 +92,7 @@ public class CommandEnabler implements IConfigSection
 	private List<ConfigItem> writeOut()
 	{
 		// Parse in original format
-		List<Pair<String, String>> list = new Vector<Pair<String, String>>();
+		List<ConfigItem> configItems = new Vector<ConfigItem>();
 		
 		for(int i = 0; i < keyList.size(); ++i)
 		{
@@ -102,19 +104,11 @@ public class CommandEnabler implements IConfigSection
 				value = disabled.toLowerCase();
 			}
 			
-			list.add(new Pair<String, String>(key, value));
-		}
-		
-		Collections.sort(list, (c1, c2) -> { return c1.First.compareTo(c2.First); });
-		
-		// Convert to new ConfigItem list format for return
-		List<ConfigItem> configItems = new Vector<ConfigItem>();
-		
-		for(Pair<String, String> pair : list)
-		{
-			configItems.add(new ConfigItem(HeaderName, pair.First, pair.Second));
+			configItems.add(new ConfigItem(HeaderName, key, value));
 		}
 		
+		Collections.sort(configItems, (c1, c2) -> { return c1.key.compareTo(c2.key); });
+
 		return configItems;
 	}