Index: AE/installer2/src/net/oni2/aeinstaller/backend/StuffToRefactorLater.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/StuffToRefactorLater.java	(revision 602)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package net.oni2.aeinstaller.backend;
-
-
-public class StuffToRefactorLater {
-	/**
-	 * Verify that the Edition is within a subfolder to vanilla Oni (..../Oni/Edition/AEInstaller)
-	 * @return true if GDF can be found in the parent's parent-path
-	 */
-	public static boolean verifyRunningDirectory() {
-		return Paths.getVanillaGDF().exists() && Paths.getVanillaGDF().isDirectory();
-	}
-}
Index: AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java	(revision 602)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java	(revision 603)
@@ -87,5 +87,7 @@
 
 			// Get taxonomy vocabulary
-			listener.cacheUpdateProgress("Updating taxonomy vocabulary", 0, 100);
+			if (listener != null)
+				listener.cacheUpdateProgress("Updating taxonomy vocabulary", 0,
+						100);
 			page = 0;
 			do {
@@ -100,5 +102,6 @@
 
 			// Get taxonomy terms
-			listener.cacheUpdateProgress("Updating taxonomy terms", 0, 100);
+			if (listener != null)
+				listener.cacheUpdateProgress("Updating taxonomy terms", 0, 100);
 			page = 0;
 			do {
@@ -113,6 +116,7 @@
 
 			// Check nodes for new information
-			listener.cacheUpdateProgress("Checking for new/updated nodes", 1,
-					100);
+			if (listener != null)
+				listener.cacheUpdateProgress("Checking for new/updated nodes",
+						1, 100);
 			HashSet<Integer> nodesToUpdate = new HashSet<Integer>();
 			page = 0;
@@ -142,6 +146,7 @@
 
 			// Check files for new stuff
-			listener.cacheUpdateProgress("Checking for new/updated files", 2,
-					100);
+			if (listener != null)
+				listener.cacheUpdateProgress("Checking for new/updated files",
+						2, 100);
 			HashSet<Integer> filesToUpdate = new HashSet<Integer>();
 			page = 0;
@@ -168,5 +173,7 @@
 			// Update nodes with new information
 			for (int nid : nodesToUpdate) {
-				listener.cacheUpdateProgress("Updating nodes", step++, total);
+				if (listener != null)
+					listener.cacheUpdateProgress("Updating nodes", step++,
+							total);
 
 				ja = DrupalJSONQuery.getItem("node", nid, "");
@@ -188,5 +195,7 @@
 			// Update new files
 			for (int fid : filesToUpdate) {
-				listener.cacheUpdateProgress("Updating files", step++, total);
+				if (listener != null)
+					listener.cacheUpdateProgress("Updating files", step++,
+							total);
 
 				ja = DrupalJSONQuery.getItem("file", fid, "&file_contents=0");
Index: AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java	(revision 602)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java	(revision 603)
@@ -148,3 +148,12 @@
 		return Integer.parseInt(fields.get("package_number"));
 	}
+
+	/**
+	 * @return Is this mod a tool?
+	 */
+	public boolean isTool() {
+		TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(
+				DepotConfig.getTaxonomyName_ModType_Tool());
+		return getTypes().contains(tt);
+	}
 }
Index: AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java	(revision 602)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java	(revision 603)
@@ -13,5 +13,4 @@
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
-import net.oni2.aeinstaller.backend.depot.DepotConfig;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
 import net.oni2.aeinstaller.backend.depot.model.NodeMod;
@@ -56,5 +55,5 @@
 			Type t = ModManager.getInstance().getTypeByName(tt.getName());
 			types.add(t);
-			if (!t.getName().equals(DepotConfig.getTaxonomyName_ModType_Tool()))
+			if (!nm.isTool())
 				t.addEntry(this);
 		}
@@ -187,6 +186,6 @@
 	 */
 	public boolean isNewerAvailable() {
-		if (node != null)
-			return node.getUploads().firstElement().getTimestamp() > localTimestamp;
+		if (file != null)
+			return file.getTimestamp() > localTimestamp;
 		else
 			return false;
@@ -261,11 +260,4 @@
 	public int getZipSize() {
 		return zipSize;
-	}
-
-	/**
-	 * @return Depot Mod-Node
-	 */
-	public NodeMod getNode() {
-		return node;
 	}
 
Index: AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java	(revision 602)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java	(revision 603)
@@ -10,5 +10,4 @@
 
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.depot.DepotConfig;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
 import net.oni2.aeinstaller.backend.depot.model.NodeMod;
@@ -56,10 +55,8 @@
 		}
 
-		TaxonomyTerm toolTerm = DepotManager.getInstance().getTaxonomyTerm(
-				DepotConfig.getTaxonomyName_ModType_Tool());
 		for (NodeMod nm : DepotManager.getInstance().getModPackageNodes()) {
 			if (nm.getUploads().size() == 1) {
 				Mod m = new Mod(nm);
-				if (nm.getTypes().contains(toolTerm))
+				if (nm.isTool())
 					tools.put(m.getPackageNumber(), m);
 				else
Index: AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 602)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 603)
@@ -272,5 +272,6 @@
 				FileUtils.copyFile(keyConfVanilla, keyConfEdition);
 
-			// TODO: FileUtils.deleteDirectory(init);
+			FileUtils.deleteDirectory(init);
+			
 			Date end = new Date();
 			log.println("Initialization ended at " + sdf.format(end));
@@ -384,3 +385,11 @@
 		}
 	}
+
+	/**
+	 * Verify that the Edition is within a subfolder to vanilla Oni (..../Oni/Edition/AEInstaller)
+	 * @return true if GDF can be found in the parent's parent-path
+	 */
+	public static boolean verifyRunningDirectory() {
+		return Paths.getVanillaGDF().exists() && Paths.getVanillaGDF().isDirectory();
+	}
 }