diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java
index 25f47e7cc8..f0aef515e2 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Plan.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java
@@ -16,8 +16,7 @@
 *    If not it should be visible on the distribution page.
 *    Or here
 *    https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/licence.yml
-*/
-
+ */
 package main.java.com.djrapitops.plan;
 
 import java.io.File;
@@ -65,7 +64,6 @@ Location Analysis to view meaningful locations on Dynmap (Investigate dynmap api
 public class Plan extends JavaPlugin {
 
     private API api;
-    private PlanLiteHook planLiteHook;
     private DataCacheHandler handler;
     private InspectCacheHandler inspectCache;
     private AnalysisCacheHandler analysisCache;
@@ -108,7 +106,6 @@ public void onEnable() {
             return;
         }
 
-        hookPlanLite();
         this.handler = new DataCacheHandler(this);
         this.inspectCache = new InspectCacheHandler(this);
         this.analysisCache = new AnalysisCacheHandler(this);
@@ -132,8 +129,7 @@ public void onEnable() {
                 startAnalysisRefreshTask(analysisRefreshMinutes);
             }
         } else if (!(Settings.SHOW_ALTERNATIVE_IP.isTrue())
-                || (Settings.USE_ALTERNATIVE_UI.isTrue()
-                && planLiteHook.isEnabled())) {
+                || (Settings.USE_ALTERNATIVE_UI.isTrue())) {
             consoleSender.sendMessage(Phrase.PREFIX + "" + Phrase.ERROR_NO_DATA_VIEW);
         }
         if (!Settings.SHOW_ALTERNATIVE_IP.isTrue() && getServer().getIp().isEmpty()) {
@@ -143,17 +139,6 @@ public void onEnable() {
         log(Phrase.ENABLED + "");
     }
 
-    /**
-     * Hooks PlanLite for UI and/or additional data.
-     */
-    public void hookPlanLite() {
-        try {
-            planLiteHook = new PlanLiteHook(this);
-        } catch (NoClassDefFoundError | Exception e) {
-
-        }
-    }
-
     /**
      * Disables the plugin.
      *
@@ -295,13 +280,6 @@ public DataCacheHandler getHandler() {
         return handler;
     }
 
-    /**
-     * @return PlanLiteHook
-     */
-    public PlanLiteHook getPlanLiteHook() {
-        return planLiteHook;
-    }
-
     /**
      * @return the Database
      */
diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanLiteHook.java b/Plan/src/main/java/com/djrapitops/plan/PlanLiteHook.java
deleted file mode 100644
index 965da17646..0000000000
--- a/Plan/src/main/java/com/djrapitops/plan/PlanLiteHook.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package main.java.com.djrapitops.plan;
-
-import com.djrapitops.planlite.PlanLite;
-import com.djrapitops.planlite.api.API;
-import com.djrapitops.planlite.api.DataPoint;
-import java.util.HashMap;
-import java.util.Set;
-import main.java.com.djrapitops.plan.data.handlers.PlanLiteDataPushHook;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import static org.bukkit.plugin.java.JavaPlugin.getPlugin;
-
-/**
- *
- * @author Rsl1122
- */
-public class PlanLiteHook {
-
-    private PlanLite planLite;
-    private Plan plugin;
-    private API planLiteApi;
-
-    private boolean enabled;
-
-    /**
-     * Class Constructor.
-     *
-     * Attempts to hook to PlanLite, if not present sets enabled to false
-     *
-     * @param plugin
-     */
-    public PlanLiteHook(Plan plugin) {
-        this.plugin = plugin;
-        if (Settings.PLANLITE_ENABLED.isTrue()) {
-            if (Bukkit.getPluginManager().isPluginEnabled("PlanLite")) {
-                try {
-                    this.planLite = getPlugin(PlanLite.class);
-                    if (planLite == null) {
-                        throw new Exception(Phrase.ERROR_PLANLITE.toString());
-                    }
-                    enabled = true;
-                    planLiteApi = planLite.getAPI();
-                    if (Settings.USE_ALTERNATIVE_UI.isTrue()) {
-                        planLite.addExtraHook("Plan", new PlanLiteDataPushHook(plugin));
-                    }
-                } catch (Exception e) {
-                }
-            } else {
-                enabled = false;
-            }
-        } else {
-            enabled = false;
-        }
-    }
-
-    /**
-     * @return Set of the Enabled hooks names.
-     */
-    public Set<String> getEnabledHooksNames() {
-        return planLite.getHooks().keySet();
-    }
-
-    /**
-     * Used to get data from PlanLite for the Analysis & Inspect.
-     *
-     * @param playerName Name of the player.
-     * @param dataPoint true (use datapoint system)
-     * @return The data about the player.
-     */
-    public HashMap<String, DataPoint> getData(String playerName, boolean dataPoint) {
-        return planLiteApi.getData(playerName, dataPoint);
-    }
-
-    /**
-     * Used to get data from PlanLite for the Analysis & Inspect.
-     *
-     * @param playerName Name of the player.
-     * @param dataPoint true (use datapoint system)
-     * @return The data about the player.
-     */
-    public HashMap<String, DataPoint> getAllData(String playerName, boolean dataPoint) {
-        return planLiteApi.getAllData(playerName, dataPoint);
-    }
-
-    /**
-     * @return true if the config setting is true & PlanLite is installed.
-     */
-    public boolean isEnabled() {
-        return enabled;
-    }
-
-    /**
-     * Passes commands to PlanLite.
-     * 
-     * Used by /plan lite
-     * @param sender
-     * @param cmd
-     * @param commandLabel
-     * @param args
-     * @return
-     */
-    public boolean passCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
-        return planLite.getPlanCommand().onCommand(sender, cmd, commandLabel, args);
-    }
-
-    /**
-     * @return true if server has towny
-     */
-    public boolean hasTowny() {
-        return getEnabledHooksNames().contains("Towny");
-    }
-
-    /**
-     * @return true if server has factions
-     */
-    public boolean hasFactions() {
-        return getEnabledHooksNames().contains("Factions");
-    }
-
-    /**
-     * @return true if server has superbvote
-     */
-    public boolean hasSuperbVote() {
-        return getEnabledHooksNames().contains("SuperbVote");
-    }
-
-    /**
-     * @return true if server has vault
-     */
-    public boolean hasVault() {
-        return getEnabledHooksNames().contains("Vault");
-    }
-}
diff --git a/Plan/src/main/java/com/djrapitops/plan/Settings.java b/Plan/src/main/java/com/djrapitops/plan/Settings.java
index eadd3e4e70..53d11e0a8c 100644
--- a/Plan/src/main/java/com/djrapitops/plan/Settings.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Settings.java
@@ -12,8 +12,7 @@ public enum Settings {
     ANALYSIS_REFRESH_ON_ENABLE("Settings.Cache.AnalysisCache.RefreshAnalysisCacheOnEnable"),
     ANALYSIS_LOG_TO_CONSOLE("Settings.Analysis.LogProgressOnConsole"),
     SHOW_ALTERNATIVE_IP("Settings.WebServer.ShowAlternativeServerIP"), 
-    USE_ALTERNATIVE_UI("Settings.PlanLite.UseAsAlternativeUI"),
-    PLANLITE_ENABLED("Settings.PlanLite.Enabled"),
+    USE_ALTERNATIVE_UI("Settings.UseTextUI"),
     GATHERLOCATIONS("Settings.Data.GatherLocations"),
     SECURITY_IP_UUID("Settings.WebServer.Security.DisplayIPsAndUUIDs"),
     // Integer
diff --git a/Plan/src/main/java/com/djrapitops/plan/api/API.java b/Plan/src/main/java/com/djrapitops/plan/api/API.java
index e29a6e0782..9ad7fc4cb2 100644
--- a/Plan/src/main/java/com/djrapitops/plan/api/API.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/API.java
@@ -4,7 +4,6 @@
 import java.util.Date;
 import java.util.UUID;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.PlanLiteHook;
 import main.java.com.djrapitops.plan.data.AnalysisData;
 import main.java.com.djrapitops.plan.data.UserData;
 import main.java.com.djrapitops.plan.ui.DataRequestHandler;
@@ -18,7 +17,6 @@
 public class API {
 
     private Plan plugin;
-    private PlanLiteHook hook;
 
     /**
      * Class Construcor.
@@ -27,7 +25,6 @@ public class API {
      */
     public API(Plan plugin) {
         this.plugin = plugin;
-        hook = plugin.getPlanLiteHook();
     }
 
     /**
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java
index 2bb094c13d..ef2fb72935 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/PlanCommand.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import main.java.com.djrapitops.plan.Phrase;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.PlanLiteHook;
 import main.java.com.djrapitops.plan.command.commands.*;
 import main.java.com.djrapitops.plan.utilities.FormatUtils;
 import org.bukkit.command.Command;
@@ -37,12 +36,6 @@ public PlanCommand(Plan plugin) {
         commands.add(new InfoCommand(plugin));
         commands.add(new ReloadCommand(plugin));
         commands.add(new ManageCommand(plugin));
-        PlanLiteHook planLiteHook = plugin.getPlanLiteHook();
-        if (planLiteHook != null) {
-            if (planLiteHook.isEnabled()) {
-                commands.add(new LiteCommand(plugin));
-            }
-        }
     }
 
     /**
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
index 548e4db2e5..b73fc92ab3 100644
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/InspectCommand.java
@@ -3,7 +3,6 @@
 import java.util.UUID;
 import main.java.com.djrapitops.plan.Phrase;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.PlanLiteHook;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.command.CommandType;
 import main.java.com.djrapitops.plan.command.SubCommand;
@@ -59,10 +58,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
         final boolean useAlternativeIP = Settings.SHOW_ALTERNATIVE_IP.isTrue();
         if (!Settings.WEBSERVER_ENABLED.isTrue()) {
             if (!useAlternativeIP) {
-                PlanLiteHook planLiteHook = plugin.getPlanLiteHook();
-                if (Settings.USE_ALTERNATIVE_UI.isTrue() && planLiteHook.isEnabled()) {
+                if (Settings.USE_ALTERNATIVE_UI.isTrue()) {
                     sender.sendMessage(Phrase.CMD_PASS_PLANLITE + "");
-                    planLiteHook.passCommand(sender, cmd, commandLabel, args);
+                    //TODO CREATE TEXT UI
                 } else {
                     sender.sendMessage(Phrase.ERROR_WEBSERVER_OFF_INSPECT + "");
                 }
diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/LiteCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/LiteCommand.java
deleted file mode 100644
index 890ace8ec0..0000000000
--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/LiteCommand.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package main.java.com.djrapitops.plan.command.commands;
-
-import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.PlanLiteHook;
-import main.java.com.djrapitops.plan.command.CommandType;
-import main.java.com.djrapitops.plan.command.SubCommand;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-
-/**
- *
- * @author Rsl1122
- */
-public class LiteCommand extends SubCommand {
-
-    private Plan plugin;
-    private PlanLiteHook hook;
-
-    /**
-     * Subcommand Constructor.
-     *
-     * @param plugin Current instance of Plan
-     */
-    public LiteCommand(Plan plugin) {
-        super("lite", "plan.?", "Use PlanLite Commands", CommandType.CONSOLE, "<planlite command>");
-
-        this.plugin = plugin;
-        this.hook = plugin.getPlanLiteHook();
-    }
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
-        if (hook.isEnabled()) {
-            return hook.passCommand(sender, cmd, commandLabel, args);
-        }
-        return false;
-    }
-}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java
index aad11357fb..3b8ef12a90 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java
@@ -43,9 +43,6 @@ public class AnalysisData {
     private long totalmobkills;
     private long totaldeaths;
 
-    private boolean planLiteEnabled;
-    private PlanLiteAnalyzedData planLiteData;
-
     /**
      * Class constructor.
      *
@@ -69,41 +66,6 @@ public void setJoinleaver(int joinleaver) {
         this.joinleaver = joinleaver;
     }
 
-    /**
-     * @return true if PlanLite was enabled at the time of Analysis
-     */
-    public boolean isPlanLiteEnabled() {
-        return planLiteEnabled;
-    }
-
-    /**
-     * @param planLiteEnabled true if PlanLite was enabled at the time of
-     * Analysis
-     */
-    public void setPlanLiteEnabled(boolean planLiteEnabled) {
-        this.planLiteEnabled = planLiteEnabled;
-    }
-
-    /**
-     * Retrieve the PlanLiteAnalyzedData.
-     *
-     * null if planLiteEnabled = false
-     *
-     * @return Seperate object used to save PlanLiteData
-     */
-    public PlanLiteAnalyzedData getPlanLiteData() {
-        return planLiteData;
-    }
-
-    /**
-     * Set the PlanLiteAnalyzedData.
-     *
-     * @param planLiteData Seperate object used to save PlanLiteData
-     */
-    public void setPlanLiteData(PlanLiteAnalyzedData planLiteData) {
-        this.planLiteData = planLiteData;
-    }
-
     /**
      * @return HTML String of the Month Activity graph
      */
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/PlanLiteAnalyzedData.java b/Plan/src/main/java/com/djrapitops/plan/data/PlanLiteAnalyzedData.java
deleted file mode 100644
index a38a27e4a1..0000000000
--- a/Plan/src/main/java/com/djrapitops/plan/data/PlanLiteAnalyzedData.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package main.java.com.djrapitops.plan.data;
-
-import java.util.HashMap;
-
-/**
- *
- * @author Rsl1122
- */
-public class PlanLiteAnalyzedData {
-
-    private HashMap<String, Integer> townMap;
-    private HashMap<String, Integer> factionMap;
-    private int totalVotes;
-    private int totalMoney;
-
-    /**
-     * Class Constructor.
-     *
-     * All data has to be set to avoid NPE.
-     */
-    public PlanLiteAnalyzedData() {
-    }
-
-    /**
-     * @return Map of Town names with residents inside them.
-     */
-    public HashMap<String, Integer> getTownMap() {
-        return townMap;
-    }
-
-    /**
-     * @param townMap Map of Town names with residents inside them.
-     */
-    public void setTownMap(HashMap<String, Integer> townMap) {
-        this.townMap = townMap;
-    }
-
-    /**
-     * @return Map of Faction names with players inside them.
-     */
-    public HashMap<String, Integer> getFactionMap() {
-        return factionMap;
-    }
-
-    /**
-     * @param factionMap Map of Faction names with players inside them.
-     */
-    public void setFactionMap(HashMap<String, Integer> factionMap) {
-        this.factionMap = factionMap;
-    }
-
-    /**
-     * @return Amount of votes the server has recieved.
-     */
-    public int getTotalVotes() {
-        return totalVotes;
-    }
-
-    /**
-     * @param totalVotes Amount of votes the server has recieved.
-     */
-    public void setTotalVotes(int totalVotes) {
-        this.totalVotes = totalVotes;
-    }
-
-    /**
-     * @return Amount of money that is in the economy.
-     */
-    public int getTotalMoney() {
-        return totalMoney;
-    }
-
-    /**
-     * @param totalMoney Amount of money that is in the economy.
-     */
-    public void setTotalMoney(int totalMoney) {
-        this.totalMoney = totalMoney;
-    }
-
-}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/PlanLitePlayerData.java b/Plan/src/main/java/com/djrapitops/plan/data/PlanLitePlayerData.java
deleted file mode 100644
index 5d5e8bf3f1..0000000000
--- a/Plan/src/main/java/com/djrapitops/plan/data/PlanLitePlayerData.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package main.java.com.djrapitops.plan.data;
-
-/**
- *
- * @author Rsl1122
- */
-public class PlanLitePlayerData {
-
-    private boolean towny;
-    private boolean factions;
-    private boolean superbVote;
-    private boolean vault;
-
-    private String town;
-    private String friends;
-    private String plotPerms;
-    private String plotOptions;
-
-    private String faction;
-
-    private int votes;
-
-    private double money;
-
-    /**
-     * Class Constructor.
-     *
-     * All data has to be set to avoid NPE
-     */
-    public PlanLitePlayerData() {
-    }
-
-    /**
-     * @param towny Is Towny installed?
-     */
-    public void setTowny(boolean towny) {
-        this.towny = towny;
-    }
-
-    /**
-     * @param factions Is Factions installed?
-     */
-    public void setFactions(boolean factions) {
-        this.factions = factions;
-    }
-
-    /**
-     * @param superbVote Is SuperbVote installed?
-     */
-    public void setSuperbVote(boolean superbVote) {
-        this.superbVote = superbVote;
-    }
-
-    /**
-     * @param vault Is Vault installed?
-     */
-    public void setVault(boolean vault) {
-        this.vault = vault;
-    }
-
-    /**
-     * @param town Name of town player is resident in (Towny)
-     */
-    public void setTown(String town) {
-        this.town = town;
-    }
-
-    /**
-     * @param friends Friends of player (Towny)
-     */
-    public void setFriends(String friends) {
-        this.friends = friends;
-    }
-
-    /**
-     * @param plotPerms Perms of player (Towny)
-     */
-    public void setPlotPerms(String plotPerms) {
-        this.plotPerms = plotPerms;
-    }
-
-    /**
-     * @param plotOptions Options of player (Towny)
-     */
-    public void setPlotOptions(String plotOptions) {
-        this.plotOptions = plotOptions;
-    }
-
-    /**
-     * @param faction Faction the player is in
-     */
-    public void setFaction(String faction) {
-        this.faction = faction;
-    }
-
-    /**
-     * @param votes How many votes the player has
-     */
-    public void setVotes(int votes) {
-        this.votes = votes;
-    }
-
-    /**
-     * @param money How much money the player has
-     */
-    public void setMoney(double money) {
-        this.money = money;
-    }
-
-    /**
-     * @return Is Towny installed?
-     */
-    public boolean hasTowny() {
-        return towny;
-    }
-
-    /**
-     * @return Is Factions installed?
-     */
-    public boolean hasFactions() {
-        return factions;
-    }
-
-    /**
-     * @return Is Superbvote installed?
-     */
-    public boolean hasSuperbVote() {
-        return superbVote;
-    }
-
-    /**
-     * @return Is Vault installed?
-     */
-    public boolean hasVault() {
-        return vault;
-    }
-
-    /**
-     * @return Town player is resident in
-     */
-    public String getTown() {
-        if (towny) {
-            return town;
-        }
-        return "";
-    }
-
-    /**
-     * @return Friends of player (towny)
-     */
-    public String getFriends() {
-        if (towny) {
-            return friends;
-        }
-        return "";
-    }
-
-    /**
-     * @return Perms of player (towny)
-     */
-    public String getPlotPerms() {
-        if (towny) {
-            return plotPerms;
-        }
-        return "";
-    }
-
-    /**
-     * @return Options of player (towny)
-     */
-    public String getPlotOptions() {
-        if (towny) {
-            return plotOptions;
-        }
-        return "";
-    }
-
-    /**
-     * @return Faction of player
-     */
-    public String getFaction() {
-        if (factions) {
-            return faction;
-        }
-        return "";
-    }
-
-    /**
-     * @return How many times player has voted, -1 if superbvote not installed
-     */
-    public int getVotes() {
-        if (superbVote) {
-            return votes;
-        }
-        return -1;
-    }
-
-    /**
-     * @return How much money player has. -1 if vault not installed
-     */
-    public double getMoney() {
-        if (vault) {
-            return money;
-        }
-        return -1;
-    }
-
-}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/UserData.java b/Plan/src/main/java/com/djrapitops/plan/data/UserData.java
index 7e5bfd3605..b676ff06f7 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/UserData.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/UserData.java
@@ -39,9 +39,6 @@ public class UserData {
     private List<KillData> playerKills;
     private int deaths;
 
-    private boolean planLiteFound;
-    private PlanLitePlayerData planLiteData;
-
     private String name;
     private boolean isOnline;
 
@@ -176,21 +173,6 @@ public void setAccessing(boolean value) {
     }
 
     // Getters -------------------------------------------------------------
-    public boolean isPlanLiteFound() {
-        return planLiteFound;
-    }
-
-    public void setPlanLiteFound(boolean planLiteFound) {
-        this.planLiteFound = planLiteFound;
-    }
-
-    public PlanLitePlayerData getPlanLiteData() {
-        return planLiteData;
-    }
-
-    public void setPlanLiteData(PlanLitePlayerData planLiteData) {
-        this.planLiteData = planLiteData;
-    }
 
     public UUID getUuid() {
         return uuid;
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
index b179046dbe..8668d311c7 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java
@@ -35,7 +35,6 @@ public class DataCacheHandler {
     private final RuleBreakingHandler ruleBreakingHandler;
     private final HashMap<String, Integer> commandUse;
     private final CommandUseHandler commandUseHandler;
-    private final PlanLiteHandler planLiteHandler;
     private final KillHandler killHandler;
     private final SessionHandler sessionHandler;
     private final Database db;
@@ -64,7 +63,6 @@ public DataCacheHandler(Plan plugin) {
         ruleBreakingHandler = new RuleBreakingHandler(plugin, this);
         commandUse = db.getCommandUse();
         commandUseHandler = new CommandUseHandler(commandUse);
-        planLiteHandler = new PlanLiteHandler(plugin);
         newPlayerCreator = new NewPlayerCreator(plugin, this);
         killHandler = new KillHandler(plugin);
         sessionHandler = new SessionHandler(plugin);
@@ -120,9 +118,6 @@ public UserData getCurrentData(UUID uuid, boolean cache) {
             if (dataCache.get(uuid) == null) {
                 UserData uData = db.getUserData(uuid);
                 if (uData != null) {
-                    if (uData.getPlanLiteData() == null) {
-                        getPlanLiteHandler().handleEvents(uData.getName(), uData);
-                    }
                     dataCache.put(uuid, uData);
                     plugin.log(Phrase.ADD_TO_CACHE.parse(uuid.toString()));
                 }
@@ -133,11 +128,6 @@ public UserData getCurrentData(UUID uuid, boolean cache) {
                 return dataCache.get(uuid);
             }
             UserData uData = db.getUserData(uuid);
-            if (uData != null) {
-                if (uData.getPlanLiteData() == null) {
-                    getPlanLiteHandler().handleEvents(uData.getName(), uData);
-                }
-            }
             return uData;
         }
     }
@@ -369,13 +359,6 @@ public GamemodeTimesHandler getGamemodeTimesHandler() {
         return gamemodeTimesHandler;
     }
 
-    /**
-     * @return Current instance of PlanLiteHandler
-     */
-    public PlanLiteHandler getPlanLiteHandler() {
-        return planLiteHandler;
-    }
-
     public KillHandler getKillHandler() {
         return killHandler;
     }
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/handlers/PlanLiteHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/handlers/PlanLiteHandler.java
deleted file mode 100644
index cdb568753b..0000000000
--- a/Plan/src/main/java/com/djrapitops/plan/data/handlers/PlanLiteHandler.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package main.java.com.djrapitops.plan.data.handlers;
-
-import com.djrapitops.planlite.api.DataPoint;
-import java.util.HashMap;
-import java.util.Set;
-import main.java.com.djrapitops.plan.Phrase;
-import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.PlanLiteHook;
-import main.java.com.djrapitops.plan.Settings;
-import main.java.com.djrapitops.plan.data.PlanLitePlayerData;
-import main.java.com.djrapitops.plan.data.UserData;
-import main.java.com.djrapitops.plan.data.cache.DataCacheHandler;
-import main.java.com.djrapitops.plan.utilities.FormatUtils;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-/**
- *
- * @author Rsl1122
- */
-public class PlanLiteHandler {
-
-    private Plan plugin;
-    private PlanLiteHook hook;
-    private DataCacheHandler handler;
-    private boolean enabled;
-
-    /**
-     * Class Constructor.
-     *
-     * @param plugin Current instance of Plan
-     */
-    public PlanLiteHandler(Plan plugin) {
-        this.plugin = plugin;
-        PlanLiteHook planLiteHook = plugin.getPlanLiteHook();
-        if (planLiteHook != null) {
-            enabled = planLiteHook.isEnabled();
-        } else {
-            enabled = false;
-        }
-        if (enabled) {
-            hook = planLiteHook;
-        }
-    }
-
-    /**
-     * Handles the player login by getting the data of the player from planlite.
-     *
-     * @param event LoginEvent
-     * @param data UserData for the player.
-     */
-    public void handleLogin(PlayerJoinEvent event, UserData data) {
-        if (!enabled) {
-            data.setPlanLiteFound(false);
-            return;
-        }
-        Player p = event.getPlayer();
-        String playerName = p.getName();
-
-        handleEvents(playerName, data);
-    }
-
-    /**
-     * Places the data to the PlanLitePlayerData and saves that to UserData.
-     *
-     * If PlanLite is used as UI the additional data of PlanLite has to be
-     * disabled to avoid stackoverflow.
-     *
-     * @param playerName Name of the Player
-     * @param data UserData for the player.
-     */
-    public void handleEvents(String playerName, UserData data) {
-        if (!enabled) {
-            return;
-        }
-        Set<String> enabledHooks = hook.getEnabledHooksNames();
-        PlanLitePlayerData plData = new PlanLitePlayerData();
-
-        // Avoiding StackOverFlow
-        if (Settings.USE_ALTERNATIVE_UI.isTrue()
-                && plugin.getPlanLiteHook().isEnabled()) {
-            data.setPlanLiteFound(false);
-            plData.setTowny(false);
-            plData.setFactions(false);
-            plData.setSuperbVote(false);
-            plData.setVault(false);
-            data.setPlanLiteData(plData);
-        } else {
-            HashMap<String, DataPoint> liteData = hook.getAllData(playerName, true);
-
-            plData.setTowny(enabledHooks.contains("Towny"));
-            plData.setFactions(enabledHooks.contains("Factions"));
-            plData.setSuperbVote(enabledHooks.contains("SuperbVote"));
-            plData.setVault(enabledHooks.contains("Vault"));
-            if (plData.hasTowny()) {
-                DataPoint town = liteData.get("TOW-TOWN");
-                plData.setTown((town != null) ? town.data() : Phrase.NOT_IN_TOWN+"");
-                DataPoint friends = liteData.get("TOW-FRIENDS");
-                plData.setFriends((town != null) ? friends.data() : "");
-                DataPoint perms = liteData.get("TOW-PLOT PERMS");
-                plData.setPlotPerms((perms != null) ? perms.data() : "");
-                DataPoint options = liteData.get("TOW-PLOT OPTIONS");
-                plData.setPlotOptions((options != null) ? options.data() : "");
-            }
-            if (plData.hasFactions()) {
-                DataPoint faction = liteData.get("FAC-FACTION");
-                plData.setFaction((faction != null) ? faction.data() : Phrase.NOT_IN_FAC+"");
-            }
-            if (plData.hasSuperbVote()) {
-                try {
-                    plData.setVotes(Integer.parseInt(liteData.get("SVO-VOTES").data()));
-                } catch (Exception e) {
-                    plData.setVotes(0);
-                }
-            }
-            if (plData.hasVault()) {
-                try {
-                    plData.setMoney(Double.parseDouble(FormatUtils.removeLetters(liteData.get("ECO-BALANCE").data())));
-                } catch (Exception e) {
-                    plData.setMoney(0);
-                }
-            }
-            data.setPlanLiteFound(true);
-            data.setPlanLiteData(plData);
-        }
-    }
-}
diff --git a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
index 6c8795b3c2..23faf15c58 100644
--- a/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/listeners/PlanPlayerListener.java
@@ -28,7 +28,6 @@ public class PlanPlayerListener implements Listener {
     private final LocationHandler locationH;
     private final DemographicsHandler demographicH;
     private final RuleBreakingHandler rulebreakH;
-    private final PlanLiteHandler planLiteH;
     private final CommandUseHandler serverHandler;
 
     /**
@@ -48,7 +47,6 @@ public PlanPlayerListener(Plan plugin) {
         demographicH = handler.getDemographicsHandler();
         locationH = handler.getLocationHandler();
         rulebreakH = handler.getRuleBreakingHandler();
-        planLiteH = handler.getPlanLiteHandler();
         serverHandler = handler.getServerDataHandler();
     }
 
@@ -73,7 +71,6 @@ public void onPlayerLogin(PlayerJoinEvent event) {
         basicInfoH.handleLogin(event, data);
         gmTimesH.handleLogin(event, data);
         demographicH.handleLogin(event, data);
-        planLiteH.handleLogin(event, data);
         (new BukkitRunnable() {
             @Override
             public void run() {
diff --git a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
index df706fed9b..d1d28c8c32 100644
--- a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
+++ b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
@@ -415,6 +415,9 @@ public Set<UUID> getSavedUUIDs() {
 
     @Override
     public void saveCommandUse(HashMap<String, Integer> data) {
+        if (data.isEmpty()) {
+            return;
+        }
         try {
             PreparedStatement statement = connection.prepareStatement(
                     "DELETE FROM " + commanduseName);
@@ -695,6 +698,9 @@ private List<KillData> getPlayerKills(String userId) throws SQLException {
 
     @Override
     public void saveMultipleUserData(List<UserData> data) {
+        if (data.isEmpty()) {
+            return;
+        }
         List<UserData> saveLast = new ArrayList<>();
         String uSQL = "UPDATE " + userName + " SET "
                 + userColumnDemAge + "=?, "
@@ -713,6 +719,7 @@ public void saveMultipleUserData(List<UserData> data) {
             PreparedStatement uStatement = connection.prepareStatement(uSQL);
             boolean commitRequired = false;
             for (UserData uData : data) {
+                uData.setAccessing(true);
                 int userId = getUserId(uData.getUuid().toString());
                 if (userId == -1) {
                     saveLast.add(uData);
@@ -738,8 +745,10 @@ public void saveMultipleUserData(List<UserData> data) {
                     uStatement.addBatch();
                 } catch (SQLException | NullPointerException e) {
                     saveLast.add(uData);
+                    uData.setAccessing(false);
                     continue;
                 }
+                uData.setAccessing(false);
                 commitRequired = true;
             }
             uStatement.executeBatch();
@@ -750,6 +759,7 @@ public void saveMultipleUserData(List<UserData> data) {
             connection.setAutoCommit(true);
             data.removeAll(saveLast);
             for (UserData uData : data) {
+                uData.setAccessing(true);
                 int userId = getUserId(uData.getUuid().toString());
                 saveLocationList(userId, uData.getLocations());
                 saveNickList(userId, uData.getNicknames(), uData.getLastNick());
@@ -758,6 +768,7 @@ public void saveMultipleUserData(List<UserData> data) {
                 savePlayerKills(userId, uData.getPlayerKills());
                 connection.setAutoCommit(true);
                 saveGMTimes(userId, uData.getGmTimes());
+                uData.setAccessing(false);
             }
             for (UserData userData : saveLast) {
                 saveUserData(userData.getUuid(), userData);
@@ -857,6 +868,9 @@ public void saveUserData(UUID uuid, UserData data) {
     }
 
     public void saveLocationList(int userId, List<Location> locations) {
+        if (locations.isEmpty()) {
+            return;
+        }
         try {
             PreparedStatement deleteStatement = connection.prepareStatement(
                     "DELETE FROM " + locationName + " WHERE UPPER(" + locationColumnUserID + ") LIKE UPPER(?)");
@@ -897,6 +911,9 @@ public void saveLocationList(int userId, List<Location> locations) {
     }
 
     public void saveNickList(int userId, HashSet<String> names, String lastNick) {
+        if (names.isEmpty()) {
+            return;
+        }
         try {
             PreparedStatement statement = connection.prepareStatement(
                     "DELETE FROM " + nicknamesName + " WHERE UPPER(" + nicknamesColumnUserID + ") LIKE UPPER(?)");
@@ -929,6 +946,9 @@ public void saveNickList(int userId, HashSet<String> names, String lastNick) {
     }
 
     public void saveSessionList(int userId, List<SessionData> sessions) {
+        if (sessions.isEmpty()) {
+            return;
+        }
         try {
             PreparedStatement statement = connection.prepareStatement(
                     "DELETE FROM " + sessionName + " WHERE UPPER(" + sessionColumnUserID + ") LIKE UPPER(?)");
@@ -961,6 +981,9 @@ public void saveSessionList(int userId, List<SessionData> sessions) {
     }
 
     public void savePlayerKills(int userId, List<KillData> kills) {
+        if (kills.isEmpty()) {
+            return;
+        }
         try {
             PreparedStatement statement = connection.prepareStatement(
                     "DELETE FROM " + killsName + " WHERE UPPER(" + killsColumnKillerUserID + ") LIKE UPPER(?)");
@@ -995,6 +1018,9 @@ public void savePlayerKills(int userId, List<KillData> kills) {
     }
 
     public void saveIPList(int userId, HashSet<InetAddress> ips) {
+        if (ips.isEmpty()) {
+            return;
+        }
         try {
             PreparedStatement statement = connection.prepareStatement(
                     "DELETE FROM " + ipsName + " WHERE UPPER(" + ipsColumnUserID + ") LIKE UPPER(?)");
@@ -1026,6 +1052,9 @@ public void saveIPList(int userId, HashSet<InetAddress> ips) {
     }
 
     public void saveGMTimes(int userId, HashMap<GameMode, Long> gamemodeTimes) {
+        if (gamemodeTimes.isEmpty()) {
+            return;
+        }
         try {
             PreparedStatement statement = connection.prepareStatement(
                     "DELETE FROM " + gamemodetimesName + " WHERE UPPER(" + gamemodetimesColumnUserID + ") LIKE UPPER(?)");
diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/DataRequestHandler.java b/Plan/src/main/java/com/djrapitops/plan/ui/DataRequestHandler.java
index a2b35bc666..2fae569e89 100644
--- a/Plan/src/main/java/com/djrapitops/plan/ui/DataRequestHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/ui/DataRequestHandler.java
@@ -1,5 +1,6 @@
 package main.java.com.djrapitops.plan.ui;
 
+import java.io.FileNotFoundException;
 import java.util.UUID;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.UserData;
@@ -47,14 +48,18 @@ public boolean checkIfCached(UUID uuid) {
      * @return The html
      */
     public String getDataHtml(UUID uuid) {
-        UserData data = inspectCache.getFromCache(uuid);
-        if (data == null) {
-            return "<h1>404 Data was not found in cache</h1>";
+        try {
+            UserData data = inspectCache.getFromCache(uuid);
+            if (data == null) {
+                return "<h1>404 Data was not found in cache</h1>";
+            }
+            return HtmlUtils.replacePlaceholders(
+                    HtmlUtils.getHtmlStringFromResource("player.html"),
+                    PlaceholderUtils.getInspectReplaceRules(data)
+            );
+        } catch (FileNotFoundException ex) {
+            return "<h1>404 player.html was not found. </h1>";
         }
-        return HtmlUtils.replacePlaceholders(
-                HtmlUtils.getHtmlStringFromResource("player.html"), 
-                PlaceholderUtils.getInspectReplaceRules(data)
-        );
     }
 
     /**
@@ -63,13 +68,17 @@ public String getDataHtml(UUID uuid) {
      * @return the html
      */
     public String getAnalysisHtml() {
-        if (!analysisCache.isCached()) {
-            return "<h1>404 Data was not found in cache</h1>";
+        try {
+            if (!analysisCache.isCached()) {
+                return "<h1>404 Data was not found in cache</h1>";
+            }
+            return HtmlUtils.replacePlaceholders(
+                    HtmlUtils.getHtmlStringFromResource("analysis.html"),
+                    PlaceholderUtils.getAnalysisReplaceRules(analysisCache.getData())
+            );
+        } catch (FileNotFoundException ex) {
+            return "<h1>404 analysis.html was not found</h1>";
         }
-        return HtmlUtils.replacePlaceholders(
-                HtmlUtils.getHtmlStringFromResource("analysis.html"), 
-                PlaceholderUtils.getAnalysisReplaceRules(analysisCache.getData())
-        );
     }
 
     /**
diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/graphs/PlayerActivityGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/ui/graphs/PlayerActivityGraphCreator.java
index 9df45cda3f..df51d3e5ab 100644
--- a/Plan/src/main/java/com/djrapitops/plan/ui/graphs/PlayerActivityGraphCreator.java
+++ b/Plan/src/main/java/com/djrapitops/plan/ui/graphs/PlayerActivityGraphCreator.java
@@ -11,6 +11,8 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.stream.Collectors;
 import main.java.com.djrapitops.plan.Phrase;
 import main.java.com.djrapitops.plan.Plan;
 import main.java.com.djrapitops.plan.data.SessionData;
@@ -32,10 +34,22 @@ public class PlayerActivityGraphCreator {
      */
     public static String createChart(List<SessionData> sessionData, long scale) {
 
-        List<Long> sessionStarts = new ArrayList<>();
-        List<Long> sessionEnds = new ArrayList<>();
-        sessionData.parallelStream().forEach(
-                (session) -> {
+        long now = new Date().toInstant().getEpochSecond() * (long) 1000;
+        long nowMinusScale = now - scale;
+        CopyOnWriteArrayList<Long> sessionStarts = new CopyOnWriteArrayList<>();
+        CopyOnWriteArrayList<Long> sessionEnds = new CopyOnWriteArrayList<>();
+        CopyOnWriteArrayList<SessionData> s = new CopyOnWriteArrayList(sessionData);
+//        List<Long> sessionStarts = sessionData.parallelStream()
+//                .filter((session) -> (session.getSessionStart() > nowMinusScale))
+//                .map(SessionData::getSessionStart)
+//                .collect(Collectors.toList());
+//        List<Long> sessionEnds = sessionData.parallelStream()
+//                .filter((session) -> (session.getSessionStart() > nowMinusScale))
+//                .map(SessionData::getSessionEnd)
+//                .collect(Collectors.toList());
+        s.parallelStream()
+                .filter((session) -> (session.getSessionStart() > nowMinusScale))
+                .forEach((session) -> {
                     sessionEnds.add(session.getSessionEnd());
                     sessionStarts.add(session.getSessionStart());
                 });
@@ -47,29 +61,26 @@ public static String createChart(List<SessionData> sessionData, long scale) {
         Plan plugin = getPlugin(Plan.class);
 
         int maxPlayers = plugin.getHandler().getMaxPlayers();
-        long now = new Date().toInstant().getEpochSecond() * (long) 1000;
-        long nowMinusScale = now - scale;
 
         int lastPValue = 0;
         int lastSavedPValue = -1;
         long lastSaveI = 0;
         for (long i = nowMinusScale; i <= now; i += 1000) {
+            final long j = i;
             if (sessionStarts.contains(i)) {
                 int amount = 0;
-                for (long start : sessionStarts) {
-                    if (start == i) {
-                        amount++;
-                    }
-                }
+                amount = sessionStarts.parallelStream()
+                        .filter((start) -> (start == j))
+                        .map((_item) -> 1)
+                        .reduce(amount, Integer::sum);
                 lastPValue += amount;
             }
             if (sessionEnds.contains(i)) {
                 int amount = 0;
-                for (long end : sessionEnds) {
-                    if (end == i) {
-                        amount++;
-                    }
-                }
+                amount = sessionEnds.parallelStream()
+                        .filter((end) -> (end == j))
+                        .map((_item) -> 1)
+                        .reduce(amount, Integer::sum);
                 lastPValue -= amount;
             }
             Double scaledDateValue = ((i - nowMinusScale) * 1.0 / scale) * 100;
diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/tables/SortedTableCreator.java b/Plan/src/main/java/com/djrapitops/plan/ui/tables/SortedTableCreator.java
index bd62a18836..ce2ea50ffa 100644
--- a/Plan/src/main/java/com/djrapitops/plan/ui/tables/SortedTableCreator.java
+++ b/Plan/src/main/java/com/djrapitops/plan/ui/tables/SortedTableCreator.java
@@ -12,6 +12,10 @@
  * @author Rsl1122
  */
 public class SortedTableCreator {
+    
+    public static String createCommandUseTable(HashMap<String, Integer> commandUse) {
+        return "Not Implemented yet";
+    }
 
     public static String createTableOutOfHashMap(HashMap<String, Integer> commandUse) {
         return createTableOutOfHashMap(commandUse, 50);
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/Analysis.java
index 8599b5f0fc..90205a0797 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/Analysis.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/Analysis.java
@@ -8,10 +8,8 @@
 import java.util.UUID;
 import main.java.com.djrapitops.plan.Phrase;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.PlanLiteHook;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.data.AnalysisData;
-import main.java.com.djrapitops.plan.data.PlanLiteAnalyzedData;
 import main.java.com.djrapitops.plan.data.RawAnalysisData;
 import main.java.com.djrapitops.plan.data.SessionData;
 import main.java.com.djrapitops.plan.data.UserData;
@@ -90,13 +88,6 @@ public void run() {
                 log(Phrase.ANALYSIS_BEGIN_ANALYSIS + "");
                 AnalysisData analysisData = new AnalysisData();
 
-                // DEPRECATED - WILL BE REMOVED
-                boolean planLiteEnabled = isPlanLiteEnabled();
-                PlanLiteAnalyzedData plData = new PlanLiteAnalyzedData();
-                HashMap<String, Integer> townMap = new HashMap<>();
-                HashMap<String, Integer> factionMap = new HashMap<>();
-                int totalVotes = 0;
-                int totalMoney = 0;
                 // Fill Dataset with userdata.
                 rawData.parallelStream().forEach((uData) -> {
                     try {
@@ -152,8 +143,6 @@ public void run() {
                 analysisData.setTop20ActivePlayers(AnalysisUtils.createActivePlayersTable(sorted.getPlaytimes(), 20));
                 analysisData.setRecentPlayers(AnalysisUtils.createListStringOutOfHashMapLong(sorted.getLatestLogins(), 20));
 
-                addPlanLiteToData(planLiteEnabled, plData, factionMap, townMap, totalVotes, totalMoney, analysisData);
-
                 long totalPlaytime = sorted.getTotalPlaytime();
                 analysisData.setTotalPlayTime(totalPlaytime);
                 analysisData.setAveragePlayTime(totalPlaytime / rawData.size());
@@ -185,30 +174,6 @@ private void createCommandUseTable(final RawAnalysisData raw, AnalysisData data)
                 }
             }
 
-            private boolean isPlanLiteEnabled() {
-                boolean planLiteEnabled;
-                PlanLiteHook planLiteHook = plugin.getPlanLiteHook();
-                if (planLiteHook != null) {
-                    planLiteEnabled = planLiteHook.isEnabled();
-                } else {
-                    planLiteEnabled = false;
-                }
-                return planLiteEnabled;
-            }
-
-            private void addPlanLiteToData(boolean planLiteEnabled, PlanLiteAnalyzedData plData, HashMap<String, Integer> factionMap, HashMap<String, Integer> townMap, int totalVotes, int totalMoney, AnalysisData data) {
-                if (planLiteEnabled) {
-                    plData.setFactionMap(factionMap);
-                    plData.setTownMap(townMap);
-                    plData.setTotalVotes(totalVotes);
-                    plData.setTotalMoney(totalMoney);
-                    data.setPlanLiteEnabled(true);
-                    data.setPlanLiteData(plData);
-                } else {
-                    data.setPlanLiteEnabled(false);
-                }
-            }
-
             private void createActivityVisalization(int totalBanned, int active, int inactive, int joinleaver, AnalysisData data) {
                 String activityPieChartHtml = AnalysisUtils.createActivityPieChart(totalBanned, active, inactive, joinleaver);
                 data.setActivityChartImgHtml(activityPieChartHtml);
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java
index d4ec33bdf7..953eaf1d7e 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java
@@ -14,16 +14,12 @@
  */
 public class HtmlUtils {
 
-    public static String getHtmlStringFromResource(String fileName) {
+    public static String getHtmlStringFromResource(String fileName) throws FileNotFoundException {
         Plan plugin = getPlugin(Plan.class);
-        File localFile = new File(plugin.getDataFolder(), fileName);        
+        File localFile = new File(plugin.getDataFolder(), fileName);
         Scanner scanner = new Scanner(plugin.getResource(fileName));
         if (localFile.exists()) {
-            try {
-                scanner = new Scanner(localFile, "UTF-8");
-            } catch (FileNotFoundException ex) {
-                ex.printStackTrace();
-            }
+            scanner = new Scanner(localFile, "UTF-8");
         }
         String html = "";
         while (scanner.hasNextLine()) {
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java
index 62f6d2b033..1c711f0e21 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/MiscUtils.java
@@ -4,7 +4,6 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Scanner;
@@ -107,15 +106,4 @@ public static Set<OfflinePlayer> getMatchingDisplaynames(String search) {
                 });
         return matches;
     }
-
-    public static boolean isOnSameDay(Date first, Date second) {
-        Date startOfFirst = getStartOfDate(first);
-        Date startOfSecond = getStartOfDate(second);
-        return (startOfFirst != startOfSecond);
-    }
-
-    public static Date getStartOfDate(Date date) {
-        Date startOfDate = new Date(date.getTime() - (date.getTime() % 86400000));
-        return startOfDate;
-    }
 }
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java
index 4e93d1c515..864c8647f1 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/PlaceholderUtils.java
@@ -1,14 +1,12 @@
 package main.java.com.djrapitops.plan.utilities;
 
+import java.io.FileNotFoundException;
 import java.util.Date;
 import java.util.HashMap;
 import main.java.com.djrapitops.plan.Phrase;
 import main.java.com.djrapitops.plan.Plan;
-import main.java.com.djrapitops.plan.PlanLiteHook;
 import main.java.com.djrapitops.plan.Settings;
 import main.java.com.djrapitops.plan.data.AnalysisData;
-import main.java.com.djrapitops.plan.data.PlanLiteAnalyzedData;
-import main.java.com.djrapitops.plan.data.PlanLitePlayerData;
 import main.java.com.djrapitops.plan.data.UserData;
 import main.java.com.djrapitops.plan.ui.Html;
 import org.bukkit.GameMode;
@@ -54,30 +52,12 @@ public static HashMap<String, String> getAnalysisReplaceRules(AnalysisData data)
         replaceMap.put("%totallogins%", "" + data.getTotalLoginTimes());
         replaceMap.put("%top20mostactive%", data.getTop20ActivePlayers());
         replaceMap.put("%recentlogins%", data.getRecentPlayers());
-        replaceMap.put("%deaths%", data.getTotaldeaths()+"");
-        replaceMap.put("%playerkills%", data.getTotalkills()+"");
-        replaceMap.put("%mobkills%", data.getTotalmobkills()+"");
+        replaceMap.put("%deaths%", data.getTotaldeaths() + "");
+        replaceMap.put("%playerkills%", data.getTotalkills() + "");
+        replaceMap.put("%mobkills%", data.getTotalmobkills() + "");
         Plan plugin = getPlugin(Plan.class);
-        PlanLiteHook hook = plugin.getPlanLiteHook();
         replaceMap.put("%version%", plugin.getDescription().getVersion());
-        if (hook != null) {
-            replaceMap.put("%planlite%", hook.isEnabled() ? getPlanLiteAnalysisHtml(data.getPlanLiteData()) : "");
-        } else {
-            replaceMap.put("%planlite%", "");
-        }
-        return replaceMap;
-    }
-
-    public static HashMap<String, String> getPlanLitePlayerReplaceRules(PlanLitePlayerData planLiteData) {
-        HashMap<String, String> replaceMap = new HashMap<>();
-        PlanLiteHook hook = getPlugin(Plan.class).getPlanLiteHook();
-        replaceMap.put("%townylinetown%", hook.hasTowny() ? Html.TOWN.parse(planLiteData.getTown()) : "");
-        replaceMap.put("%townylineplotperms%", "");
-        replaceMap.put("%townylineplotoptions%", hook.hasTowny() ? Html.PLOT_OPTIONS.parse(planLiteData.getPlotOptions()) : "");
-        replaceMap.put("%townylinefriends%", hook.hasTowny() ? Html.FRIENDS.parse(planLiteData.getFriends()) : "");
-        replaceMap.put("%factionsline%", hook.hasFactions() ? Html.FACTION.parse(planLiteData.getFaction()) : "");
-        replaceMap.put("%totalmoneyline%", hook.hasVault() ? Html.BALANCE.parse(planLiteData.getMoney() + "") : "");
-        replaceMap.put("%totalvotesline%", hook.hasSuperbVote() ? Html.VOTES.parse(planLiteData.getVotes() + "") : "");
+        replaceMap.put("%planlite%", "");
         return replaceMap;
     }
 
@@ -86,8 +66,9 @@ public static HashMap<String, String> getPlanLitePlayerReplaceRules(PlanLitePlay
      *
      * @param data UserData used to replace the placeholders with
      * @return HashMap that contains string for each placeholder.
+     * @throws java.io.FileNotFoundException if planliteplayer.html is not found
      */
-    public static HashMap<String, String> getInspectReplaceRules(UserData data) {
+    public static HashMap<String, String> getInspectReplaceRules(UserData data) throws FileNotFoundException {
         HashMap<String, String> replaceMap = new HashMap<>();
         boolean showIPandUUID = Settings.SECURITY_IP_UUID.isTrue();
         replaceMap.put("%uuid%", (showIPandUUID ? "" + data.getUuid() : Html.HIDDEN.parse()));
@@ -130,44 +111,13 @@ public static HashMap<String, String> getInspectReplaceRules(UserData data) {
         replaceMap.put("%op%", data.isOp() ? Html.OPERATOR.parse() : "");
         replaceMap.put("%isonline%", (data.isOnline()) ? Html.ONLINE.parse() : Html.OFFLINE.parse());
         int deaths = data.getDeaths();
-        replaceMap.put("%deaths%", deaths+"");
-        replaceMap.put("%playerkills%", data.getPlayerKills()+"");
-        replaceMap.put("%mobkills%", data.getMobKills()+"");
+        replaceMap.put("%deaths%", deaths + "");
+        replaceMap.put("%playerkills%", data.getPlayerKills() + "");
+        replaceMap.put("%mobkills%", data.getMobKills() + "");
         Plan plugin = getPlugin(Plan.class);
         replaceMap.put("%version%", plugin.getDescription().getVersion());
-        PlanLiteHook hook = plugin.getPlanLiteHook();
-        if (hook != null) {
-            replaceMap.put("%planlite%", hook.isEnabled() ? getPlanLitePlayerHtml(data.getPlanLiteData()) : "");
-        } else {
-            replaceMap.put("%planlite%", "");
-        }
+        replaceMap.put("%planlite%", "");
         replaceMap.put("%inaccuratedatawarning%", (new Date().getTime() - data.getRegistered() < 180000) ? Html.WARN_INACCURATE.parse() : "");
         return replaceMap;
     }
-
-    public static HashMap<String, String> getPlanLiteAnalysisReplaceRules(PlanLiteAnalyzedData planLiteData) {
-        HashMap<String, String> replaceMap = new HashMap<>();
-        PlanLiteHook hook = getPlugin(Plan.class).getPlanLiteHook();
-        replaceMap.put("%townyheader%", hook.hasTowny() ? Html.TOP_TOWNS.parse() : "");
-        replaceMap.put("%townylist%", hook.hasTowny() ? AnalysisUtils.createTableOutOfHashMap(planLiteData.getTownMap(), 20) : "");
-        replaceMap.put("%factionheader%", hook.hasFactions() ? Html.TOP_FACTIONS.parse() : "");
-        replaceMap.put("%factionlist%", hook.hasFactions() ? AnalysisUtils.createTableOutOfHashMap(planLiteData.getFactionMap(), 20) : "");
-        replaceMap.put("%totalmoneyline%", hook.hasVault() ? Html.TOTAL_BALANCE.parse(planLiteData.getTotalMoney() + "") : "");
-        replaceMap.put("%totalvotesline%", hook.hasSuperbVote() ? Html.TOTAL_VOTES.parse(planLiteData.getTotalVotes() + "") : "");
-        return replaceMap;
-    }
-
-    private static String getPlanLitePlayerHtml(PlanLitePlayerData planLiteData) {
-        return HtmlUtils.replacePlaceholders(
-                HtmlUtils.getHtmlStringFromResource("planliteplayer.html"),
-                PlaceholderUtils.getPlanLitePlayerReplaceRules(planLiteData)
-        );
-    }
-
-    private static String getPlanLiteAnalysisHtml(PlanLiteAnalyzedData planLiteData) {
-        return HtmlUtils.replacePlaceholders(
-                HtmlUtils.getHtmlStringFromResource("planlite.html"),
-                PlaceholderUtils.getPlanLiteAnalysisReplaceRules(planLiteData)
-        );
-    }
 }
diff --git a/Plan/src/main/resources/config.yml b/Plan/src/main/resources/config.yml
index fa128e73d7..5b6c36acf8 100644
--- a/Plan/src/main/resources/config.yml
+++ b/Plan/src/main/resources/config.yml
@@ -1,5 +1,6 @@
 Settings:
   Locale: default
+  UseTextUI: false
   Data:
     GatherLocations: true
   Analysis:
@@ -21,10 +22,7 @@ Settings:
     AlternativeIP: your.ip.here:%port%
     Security:
       DisplayIPsAndUUIDs: true
-      AddressSecurityCode: bAkEd      
-  PlanLite:
-    Enabled: true
-    UseAsAlternativeUI: false
+      AddressSecurityCode: bAkEd
 
 Customization:
   Colors:
diff --git a/Plan/src/main/resources/planlite.html b/Plan/src/main/resources/planlite.html
deleted file mode 100644
index 50d1a8ad51..0000000000
--- a/Plan/src/main/resources/planlite.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<tr>
-    <td style="margin-left: 3px; margin-right: auto;border-style: groove; border-width: 3px;
-        border-radius: 12px; padding: 2px 4px 2px 3px; box-shadow: 5px 5px 4px 0px #888888;">
-        <h4>Information from PlanLite</h4>
-        %totalmoneyline%
-        %totalvotesline%
-<!--        <br/><h4>Richest Players</h4>
-        %top10richest%
-        <br/><h4>Top Voters</h4>
-        %top10votes%-->
-    </td>
-    <td style="margin-left: 3px; margin-right: auto;border-style: groove; border-width: 3px;
-        border-radius: 12px; padding: 2px 4px 2px 3px; box-shadow: 5px 5px 4px 0px #888888;">
-        %townyheader%
-        %townylist%
-        <br/>
-        %factionheader%
-        %factionlist%
-    </td>            
-</tr>
\ No newline at end of file
diff --git a/Plan/src/main/resources/planliteplayer.html b/Plan/src/main/resources/planliteplayer.html
deleted file mode 100644
index 5614b938c1..0000000000
--- a/Plan/src/main/resources/planliteplayer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<tr>
-    <td style="margin-left: 3px; margin-right: auto;border-style: groove; border-width: 3px;
-        border-radius: 12px; padding: 2px 4px 2px 3px; box-shadow: 5px 5px 4px 0px #888888;">
-        <h4>Information from PlanLite</h4>
-        %totalmoneyline%
-        %totalvotesline%
-        %factionsline%
-        %townylinetown%
-        %townylineplotperms%
-        %townylineplotoptions%
-        %townylinefriends%
-    </td>
-</tr>
\ No newline at end of file
diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml
index 2048071c66..4846b91477 100644
--- a/Plan/src/main/resources/plugin.yml
+++ b/Plan/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Plan
 author: Rsl1122
-main: com.djrapitops.plan.Plan
+main: main.java.com.djrapitops.plan.Plan
 version: 2.5.2
 
 commands:
@@ -23,9 +23,6 @@ commands:
     usage: /plan manage <manage subcommand>
     description: manage the database
   
-softdepend:
-- PlanLite
-
 permissions:
   plan.?:
     description: Help command
diff --git a/PlanDebugger/build.xml b/PlanDebugger/build.xml
deleted file mode 100644
index d21e575cce..0000000000
--- a/PlanDebugger/build.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="PlanDebugger" default="default" basedir=".">
-    <description>Builds, tests, and runs the project PlanDebugger.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar:                  JAR building
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="PlanDebugger-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>
diff --git a/PlanDebugger/manifest.mf b/PlanDebugger/manifest.mf
deleted file mode 100644
index 328e8e5bc3..0000000000
--- a/PlanDebugger/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/PlanDebugger/nbproject/build-impl.xml b/PlanDebugger/nbproject/build-impl.xml
deleted file mode 100644
index 41f3a06391..0000000000
--- a/PlanDebugger/nbproject/build-impl.xml
+++ /dev/null
@@ -1,1420 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - test compilation
-  - test execution
-  - test debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="PlanDebugger-impl">
-    <fail message="Please build using Ant 1.8.0 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.8.0"/>
-            </not>
-        </condition>
-    </fail>
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.6"/>
-        <property name="default.javac.target" value="1.6"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <property name="platform.java" value="${java.home}/bin/java"/>
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="splashscreen.available">
-            <and>
-                <not>
-                    <equals arg1="${application.splash}" arg2="" trim="true"/>
-                </not>
-                <available file="${application.splash}"/>
-            </and>
-        </condition>
-        <condition property="main.class.available">
-            <and>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="profile.available">
-            <and>
-                <isset property="javac.profile"/>
-                <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <or>
-                <not>
-                    <istrue value="${jar.archive.disabled}"/>
-                </not>
-                <istrue value="${not.archive.disabled}"/>
-            </or>
-        </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="do.archive+manifest.available">
-            <and>
-                <isset property="manifest.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+main.class.available">
-            <and>
-                <isset property="main.class.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+splashscreen.available">
-            <and>
-                <isset property="splashscreen.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="do.archive+profile.available">
-            <and>
-                <isset property="profile.available"/>
-                <istrue value="${do.archive}"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="run.jvmargs.ide" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <property name="runtime.encoding" value="${source.encoding}"/>
-        <property name="manifest.encoding" value="${source.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <and>
-                <isset property="endorsed.classpath"/>
-                <not>
-                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
-            <isset property="profile.available"/>
-        </condition>
-        <condition else="false" property="jdkBug6558476">
-            <and>
-                <matches pattern="1\.[56]" string="${java.specification.version}"/>
-                <not>
-                    <os family="unix"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="javac.fork">
-            <or>
-                <istrue value="${jdkBug6558476}"/>
-                <istrue value="${javac.external.vm}"/>
-            </or>
-        </condition>
-        <property name="jar.index" value="false"/>
-        <property name="jar.index.metainf" value="${jar.index}"/>
-        <property name="copylibs.rebase" value="true"/>
-        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
-        <condition property="junit.available">
-            <or>
-                <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
-                <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
-            </or>
-        </condition>
-        <condition property="testng.available">
-            <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
-        </condition>
-        <condition property="junit+testng.available">
-            <and>
-                <istrue value="${junit.available}"/>
-                <istrue value="${testng.available}"/>
-            </and>
-        </condition>
-        <condition else="testng" property="testng.mode" value="mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <condition else="" property="testng.debug.mode" value="-mixed">
-            <istrue value="${junit+testng.available}"/>
-        </condition>
-        <property name="java.failonerror" value="true"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <mkdir dir="@{apgeneratedsrcdir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <compilerarg value="-processorpath"/>
-                    <compilerarg path="@{processorpath}:${empty.dir}"/>
-                    <compilerarg line="${ap.processors.internal}"/>
-                    <compilerarg line="${annotation.processing.processor.options}"/>
-                    <compilerarg value="-s"/>
-                    <compilerarg path="@{apgeneratedsrcdir}"/>
-                    <compilerarg line="${ap.proc.none.internal}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${javac.processorpath}" name="processorpath"/>
-            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
-            <attribute default="${empty.dir}" name="gensrcdir"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.dir}/empty" name="empty.dir"/>
-                <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
-                    <src>
-                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
-                            <include name="*"/>
-                        </dirset>
-                    </src>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
-                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
-                <delete>
-                    <files includesfile="${javac.includesfile.binary}"/>
-                </delete>
-                <delete>
-                    <fileset file="${javac.includesfile.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-init">
-        <condition else="false" property="nb.junit.batch" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <not>
-                    <isset property="test.method"/>
-                </not>
-            </and>
-        </condition>
-        <condition else="false" property="nb.junit.single" value="true">
-            <and>
-                <istrue value="${junit.available}"/>
-                <isset property="test.method"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-init-test-properties">
-        <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
-        <property name="test.binarytestincludes" value=""/>
-        <property name="test.binaryexcludes" value=""/>
-    </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
-    <target if="${testng.available}" name="-init-macrodef-testng">
-        <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
-                    <isset property="test.method"/>
-                </condition>
-                <union id="test.set">
-                    <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                </union>
-                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="PlanDebugger" testname="TestNG tests" workingDir="${work.dir}">
-                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
-                    <propertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </propertyset>
-                    <customize/>
-                </testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-test-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <echo>No tests executed.</echo>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
-        <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:testng>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
-        <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <sequential>
-                <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
-        <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
-            <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target if="${testng.available}" name="-init-macrodef-testng-debug">
-        <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element name="customize2" optional="true"/>
-            <sequential>
-                <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
-                    <isset property="test.method"/>
-                </condition>
-                <condition else="-suitename PlanDebugger -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
-                    <matches pattern=".*\.xml" string="@{testClass}"/>
-                </condition>
-                <delete dir="${build.test.results.dir}" quiet="true"/>
-                <mkdir dir="${build.test.results.dir}"/>
-                <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
-                        <customize2/>
-                        <jvmarg value="-ea"/>
-                        <arg line="${testng.debug.mode}"/>
-                        <arg line="-d ${build.test.results.dir}"/>
-                        <arg line="-listener org.testng.reporters.VerboseReporter"/>
-                        <arg line="${testng.cmd.args}"/>
-                    </customize>
-                </j2seproject3:debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
-        <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <element implicit="true" name="customize2" optional="true"/>
-            <sequential>
-                <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2/>
-                </j2seproject3:testng-debug>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                        <jvmarg line="${run.jvmargs}"/>
-                        <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
-                </j2seproject3:test-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
-        <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <attribute default="${main.class}" name="testClass"/>
-            <attribute default="" name="testMethod"/>
-            <sequential>
-                <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
-                    <customize2>
-                        <syspropertyset>
-                            <propertyref prefix="test-sys-prop."/>
-                            <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                        </syspropertyset>
-                    </customize2>
-                </j2seproject3:testng-debug-impl>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
-    <!--
-                pre NB7.2 profiling section; consider it deprecated
-            -->
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-    <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
-        <macrodef name="resolve">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${env.@{value}}"/>
-            </sequential>
-        </macrodef>
-        <macrodef name="profile">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property environment="env"/>
-                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
-                    <jvmarg line="${profiler.info.jvmargs}"/>
-                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-                    <arg line="${application.args}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-    </target>
-    <!--
-                end of pre NB7.2 profiling section
-            -->
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${run.classpath}" name="classpath"/>
-            <attribute default="jvm" name="jvm"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-copylibs">
-        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${manifest.file}" name="manifest"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-                <pathconvert property="run.classpath.without.build.classes.dir">
-                    <path path="${run.classpath}"/>
-                    <map from="${build.classes.dir.resolved}" to=""/>
-                </pathconvert>
-                <pathconvert pathsep=" " property="jar.classpath">
-                    <path path="${run.classpath.without.build.classes.dir}"/>
-                    <chainedmapper>
-                        <flattenmapper/>
-                        <filtermapper>
-                            <replacestring from=" " to="%20"/>
-                        </filtermapper>
-                        <globmapper from="*" to="lib/*"/>
-                    </chainedmapper>
-                </pathconvert>
-                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-                    <manifest>
-                        <attribute name="Class-Path" value="${jar.classpath}"/>
-                        <customize/>
-                    </manifest>
-                </copylibs>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
-                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="-init-ap-cmdline-properties">
-        <property name="annotation.processing.enabled" value="true"/>
-        <property name="annotation.processing.processors.list" value=""/>
-        <property name="annotation.processing.processor.options" value=""/>
-        <property name="annotation.processing.run.all.processors" value="true"/>
-        <property name="javac.processorpath" value="${javac.classpath}"/>
-        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
-        <condition property="ap.supported.internal" value="true">
-            <not>
-                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
-            </not>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
-        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
-            <isfalse value="${annotation.processing.run.all.processors}"/>
-        </condition>
-        <condition else="" property="ap.proc.none.internal" value="-proc:none">
-            <isfalse value="${annotation.processing.enabled}"/>
-        </condition>
-    </target>
-    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
-        <property name="ap.cmd.line.internal" value=""/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target name="-deps-jar-init" unless="built-jar.properties">
-        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
-        <delete file="${built-jar.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: PlanDebugger was already built"/>
-    </target>
-    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-jar.properties}" verbose="false"/>
-        <property file="${built-jar.properties}" prefix="already.built.jar."/>
-        <antcall target="-warn-already-built-jar"/>
-        <propertyfile file="${built-jar.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <pathconvert property="build.generated.subdirs">
-            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="*"/>
-            </dirset>
-        </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target if="has.persistence.xml" name="-copy-persistence-xml">
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <touch file="${tmp.manifest.file}" verbose="false"/>
-    </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Main-Class" value="${main.class}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="Profile" value="${javac.profile}"/>
-        </manifest>
-    </target>
-    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
-        <basename file="${application.splash}" property="splashscreen.basename"/>
-        <mkdir dir="${build.classes.dir}/META-INF"/>
-        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
-            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-        </manifest>
-    </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
-        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
-        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
-            <isset property="main.class.available"/>
-        </condition>
-        <condition else="debug" property="jar.usage.level" value="info">
-            <isset property="main.class.available"/>
-        </condition>
-        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
-    </target>
-    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
-        <delete>
-            <fileset file="${tmp.manifest.file}"/>
-        </delete>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <target depends="init,compile-test-single" name="run-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                =================
-                PROFILING SECTION
-                =================
-            -->
-    <!--
-                pre NB7.2 profiler integration
-            -->
-    <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile/>
-    </target>
-    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
-        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="${profile.class}"/>
-    </target>
-    <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <profile classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </profile>
-    </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
-        <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
-        <nbprofiledirect>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-        </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
-    <!--
-                end of pre NB72 profiling section
-            -->
-    <target if="netbeans.home" name="-profile-check">
-        <condition property="profiler.configured">
-            <or>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-                <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-            </or>
-        </condition>
-    </target>
-    <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
-        <startprofiler/>
-        <antcall target="run"/>
-    </target>
-    <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-single"/>
-    </target>
-    <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
-    <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <startprofiler/>
-        <antcall target="test-single"/>
-    </target>
-    <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <startprofiler/>
-        <antcall target="run-test-with-main"/>
-    </target>
-    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <startprofiler/>
-        <antcall target="run-applet"/>
-    </target>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
-            <and>
-                <isset property="endorsed.classpath.cmd.line.arg"/>
-                <not>
-                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-        </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/*.java"/>
-                <exclude name="*.java"/>
-            </fileset>
-            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                TEST COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                TEST EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
-        <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
-        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
-    <!--
-                =======================
-                TEST DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
-        <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target name="-deps-clean-init" unless="built-clean.properties">
-        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
-        <delete file="${built-clean.properties}" quiet="true"/>
-    </target>
-    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: PlanDebugger was already built"/>
-    </target>
-    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
-        <mkdir dir="${build.dir}"/>
-        <touch file="${built-clean.properties}" verbose="false"/>
-        <property file="${built-clean.properties}" prefix="already.built.clean."/>
-        <antcall target="-warn-already-built-clean"/>
-        <propertyfile file="${built-clean.properties}">
-            <entry key="${basedir}" value=""/>
-        </propertyfile>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-    <target name="-check-call-dep">
-        <property file="${call.built.properties}" prefix="already.built."/>
-        <condition property="should.call.dep">
-            <and>
-                <not>
-                    <isset property="already.built.${call.subproject}"/>
-                </not>
-                <available file="${call.script}"/>
-            </and>
-        </condition>
-    </target>
-    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
-    </target>
-</project>
diff --git a/PlanDebugger/nbproject/genfiles.properties b/PlanDebugger/nbproject/genfiles.properties
deleted file mode 100644
index e686534b5c..0000000000
--- a/PlanDebugger/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=a317dbfb
-build.xml.script.CRC32=e58faa21
-build.xml.stylesheet.CRC32=8064a381@1.80.1.48
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=a317dbfb
-nbproject/build-impl.xml.script.CRC32=47a3e003
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
diff --git a/PlanDebugger/nbproject/project.properties b/PlanDebugger/nbproject/project.properties
deleted file mode 100644
index db071e1225..0000000000
--- a/PlanDebugger/nbproject/project.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/PlanDebugger.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.craftbukkit-1.11.2.jar=D:\\Minecraft Servers\\Buildtools\\craftbukkit-1.11.2.jar
-file.reference.Plan-jar-with-dependencies.jar=..\\Plan\\target\\Plan-jar-with-dependencies.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.Plan-jar-with-dependencies.jar}:\
-    ${file.reference.craftbukkit-1.11.2.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.external.vm=true
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=com.djrapitops.plandebugger.PlanDebugger
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
diff --git a/PlanDebugger/nbproject/project.xml b/PlanDebugger/nbproject/project.xml
deleted file mode 100644
index 05be0f92d1..0000000000
--- a/PlanDebugger/nbproject/project.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>PlanDebugger</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
diff --git a/PlanDebugger/src/com/djrapitops/plandebugger/PlanDebugger.java b/PlanDebugger/src/com/djrapitops/plandebugger/PlanDebugger.java
deleted file mode 100644
index 921c1f7a1d..0000000000
--- a/PlanDebugger/src/com/djrapitops/plandebugger/PlanDebugger.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-*    Player Analytics Bukkit plugin for monitoring server activity.
-*    Copyright (C) 2016  Risto Lahtela / Rsl1122
-*
-*    This program is free software: you can redistribute it and/or modify
-*    it under the terms of the Plan License. (licence.yml)
-*    Modified software can only be redistributed if allowed in the licence.
-*
-*    This program is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    License for more details.
-*
-*    You should have received a copy of the License
-*    along with this program. 
-*    If not it should be visible on the distribution page.
-*    Or here
-*    https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/licence.yml
- */
-package com.djrapitops.plandebugger;
-
-import com.djrapitops.plan.Plan;
-import com.djrapitops.plan.utilities.FormatUtils;
-import com.djrapitops.plandebugger.config.ConfigSetter;
-import com.djrapitops.plandebugger.config.SettingsList;
-import com.djrapitops.plandebugger.tests.IndependentTestRunner;
-import com.djrapitops.plandebugger.tests.PluginTestRunner;
-import com.djrapitops.plandebugger.tests.TestRunner;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.List;
-import main.java.com.djrapitops.plan.Settings;
-import org.bukkit.plugin.java.JavaPlugin;
-
-/**
- *
- * @author Rsl1122
- */
-public class PlanDebugger extends JavaPlugin {
-
-    private Plan plan;
-    private ConfigSetter configSetter;
-    private String originalDB;
-    private String debugTime;
-
-    @Override
-    public void onEnable() {
-        plan = getPlugin(Plan.class);
-        runConsoleCommand("plan manage backup mysql");
-        runConsoleCommand("plan manage backup sqlite");
-        originalDB = plan.getConfig().getString(Settings.DB_TYPE.getPath());
-        configSetter = new ConfigSetter(this, plan);
-        debugTime = FormatUtils.formatTimeStamp(new Date().getTime()+"").replaceAll(" ", "");
-        int[] r = new int[]{0, 0, 0};
-        TestRunner iTestRunner = new IndependentTestRunner(this, plan);
-        List<String> errors = iTestRunner.runAllTests();
-        r[0] = iTestRunner.getTestsRun();
-        r[1] = iTestRunner.getTestsFailed();
-        r[2] = iTestRunner.getTestsError();
-        TestRunner testRunner = new PluginTestRunner(this, plan);
-        for (SettingsList s : SettingsList.values()) {
-            configSetter.setSettings(s);
-            errors.addAll(testRunner.runAllTests());
-        }
-        log("\nTEST RESULTS - Run: "+r[0]+" Success: "+(r[0]-r[1]-r[2])+" Failed: "+r[1]+" Errors: "+r[2]+"\n");
-        log("ERRORS:");
-        for (String error : errors) {
-            logError("Error: "+error);
-        }
-    }
-
-    @Override
-    public void onDisable() {
-        plan.getConfig().set(Settings.DB_TYPE.getPath(), originalDB);
-        configSetter.resetSettings();
-        log("Tests Complete!");
-        log("Restore the old database by using the restore command.");
-    }
-
-    public void log(String message) {
-        getLogger().info(message);
-        toLog(message);
-    }
-
-    public void logError(String message) {
-        getLogger().severe(message);
-        toLog(message);
-    }
-
-    public void toLog(String message) {
-        File folder = getDataFolder();
-        if (!folder.exists()) {
-            folder.mkdir();
-        }
-        File log = new File(getDataFolder(), "DebugLog-" + debugTime + ".txt");
-        try {
-            if (!log.exists()) {
-                log.createNewFile();
-            }
-            FileWriter fw = new FileWriter(log, true);
-            try (PrintWriter pw = new PrintWriter(fw)) {
-                String timestamp = FormatUtils.formatTimeStamp(new Date().getTime()+"");
-                pw.println("["+timestamp+"] "+message + "\n");
-                pw.flush();
-            }
-        } catch (IOException e) {
-            logError("Failed to create log.txt file");
-        }
-    }
-    
-    public void runConsoleCommand(String command) {
-        getServer().dispatchCommand(getServer().getConsoleSender(), command);
-    }
-}
diff --git a/PlanDebugger/src/com/djrapitops/plandebugger/config/ConfigSetter.java b/PlanDebugger/src/com/djrapitops/plandebugger/config/ConfigSetter.java
deleted file mode 100644
index c7be6769ba..0000000000
--- a/PlanDebugger/src/com/djrapitops/plandebugger/config/ConfigSetter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.djrapitops.plandebugger.config;
-
-import com.djrapitops.plan.Plan;
-import com.djrapitops.plandebugger.PlanDebugger;
-import main.java.com.djrapitops.plan.Settings;
-import org.bukkit.configuration.file.FileConfiguration;
-
-/**
- *
- * @author Rsl1122
- */
-public class ConfigSetter {
-
-    private Plan plan;
-    private PlanDebugger debug;
-    private String[] originalSettings;
-
-    public ConfigSetter(PlanDebugger debug, Plan plan) {
-        this.plan = plan;
-        this.debug = debug;
-        originalSettings = getDefaultSettings();
-    }
-
-    public void setSettings(SettingsList list) {
-        setSettings(list.getValues());
-        debug.log("SETTINGS Set settings to "+list.name());
-    }
-    
-    public void setSettings(String[] s) {
-        FileConfiguration c = plan.getConfig();
-        c.set(Settings.LOCALE.getPath(), s[0]);
-        c.set(Settings.GATHERLOCATIONS.getPath(), s[1]);
-        c.set(Settings.ANALYSIS_LOG_TO_CONSOLE.getPath(), s[2]);
-        c.set(Settings.ANALYSIS_MINUTES_FOR_ACTIVE.getPath(), s[3]);
-        c.set(Settings.ANALYSIS_REFRESH_ON_ENABLE.getPath(), s[4]);
-        c.set(Settings.ANALYSIS_AUTO_REFRESH.getPath(), s[5]);
-        c.set(Settings.CLEAR_INSPECT_CACHE.getPath(), s[6]);
-        c.set(Settings.SAVE_CACHE_MIN.getPath(), s[7]);
-        c.set(Settings.SAVE_SERVER_MIN.getPath(), s[8]);
-        c.set(Settings.CLEAR_CACHE_X_SAVES.getPath(), s[9]);
-        c.set(Settings.WEBSERVER_ENABLED.getPath(), s[10]);
-        c.set(Settings.WEBSERVER_PORT.getPath(), s[11]);
-        c.set(Settings.SHOW_ALTERNATIVE_IP.getPath(), s[12]);
-        c.set(Settings.ALTERNATIVE_IP.getPath(), s[13]);
-        c.set(Settings.SECURITY_IP_UUID.getPath(), s[14]);
-        c.set(Settings.SECURITY_CODE.getPath(), s[15]);
-        c.set(Settings.PLANLITE_ENABLED.getPath(), s[16]);
-        c.set(Settings.USE_ALTERNATIVE_UI.getPath(), s[17]);
-        plan.saveConfig();
-        plan.reloadConfig();
-        plan.onDisable();
-        plan.onEnable();
-    }
-
-    public void resetSettings() {
-        setSettings(originalSettings);
-    }
-
-    private String[] getDefaultSettings() {
-        FileConfiguration c = plan.getConfig();
-        return new String[]{
-            c.get(Settings.LOCALE.getPath()) + "",
-            c.get(Settings.GATHERLOCATIONS.getPath()) + "",
-            c.get(Settings.ANALYSIS_LOG_TO_CONSOLE.getPath()) + "",
-            c.get(Settings.ANALYSIS_MINUTES_FOR_ACTIVE.getPath()) + "",
-            c.get(Settings.ANALYSIS_REFRESH_ON_ENABLE.getPath()) + "",
-            c.get(Settings.ANALYSIS_AUTO_REFRESH.getPath()) + "",
-            c.get(Settings.CLEAR_INSPECT_CACHE.getPath()) + "",
-            c.get(Settings.SAVE_CACHE_MIN.getPath()) + "",
-            c.get(Settings.SAVE_SERVER_MIN.getPath()) + "",
-            c.get(Settings.CLEAR_CACHE_X_SAVES.getPath()) + "",
-            c.get(Settings.WEBSERVER_ENABLED.getPath()) + "",
-            c.get(Settings.WEBSERVER_PORT.getPath()) + "",
-            c.get(Settings.SHOW_ALTERNATIVE_IP.getPath()) + "",
-            c.get(Settings.ALTERNATIVE_IP.getPath()) + "",
-            c.get(Settings.SECURITY_IP_UUID.getPath()) + "",
-            c.get(Settings.SECURITY_CODE.getPath()) + "",
-            c.get(Settings.PLANLITE_ENABLED.getPath()) + "",
-            c.get(Settings.USE_ALTERNATIVE_UI.getPath()) + ""
-        };
-    }
-}
diff --git a/PlanDebugger/src/com/djrapitops/plandebugger/config/SettingsList.java b/PlanDebugger/src/com/djrapitops/plandebugger/config/SettingsList.java
deleted file mode 100644
index faa67dc0b8..0000000000
--- a/PlanDebugger/src/com/djrapitops/plandebugger/config/SettingsList.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.djrapitops.plandebugger.config;
-
-/**
- *
- * @author Rsl1122
- */
-public enum SettingsList {
-    DEFAULT(new String[]{"default", "true", "false", "10", "true", "-1", "5", "2", "1", "5", "true", "8804", "false", "your.ip.here:%port%", "true", "bAkEd", "true", "false"});
-
-    private String[] values;
-
-    private SettingsList(String[] values) {
-        this.values = values;
-    }
-
-    public String[] getValues() {
-        return values;
-    }
-}
diff --git a/PlanDebugger/src/com/djrapitops/plandebugger/tests/IndependentTestRunner.java b/PlanDebugger/src/com/djrapitops/plandebugger/tests/IndependentTestRunner.java
deleted file mode 100644
index 464575e42b..0000000000
--- a/PlanDebugger/src/com/djrapitops/plandebugger/tests/IndependentTestRunner.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.djrapitops.plandebugger.tests;
-
-import com.djrapitops.plan.Plan;
-import com.djrapitops.plandebugger.PlanDebugger;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Rsl1122
- */
-public class IndependentTestRunner extends TestRunner {
-    private List<Test> tests;
-
-    public IndependentTestRunner(PlanDebugger debug, Plan plan) {
-        super(debug, plan);
-    }
-        
-    @Override
-    public List<String> runAllTests() {
-        List<String> errors = new ArrayList<>();
-        for (Test test : tests) {
-            try {
-                test.runTest();
-            } catch (Exception e) {
-                String msg = "Test "+test.getTestName()+" ran into ERROR: "+e.getMessage();
-                debug.logError(msg);
-                for (StackTraceElement x : e.getStackTrace()) {
-                    debug.toLog(x+"");
-                }
-                errors.add(msg);
-            }
-        }
-        return errors;
-    }     
-}
diff --git a/PlanDebugger/src/com/djrapitops/plandebugger/tests/PluginTestRunner.java b/PlanDebugger/src/com/djrapitops/plandebugger/tests/PluginTestRunner.java
deleted file mode 100644
index 48d3514979..0000000000
--- a/PlanDebugger/src/com/djrapitops/plandebugger/tests/PluginTestRunner.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.djrapitops.plandebugger.tests;
-
-import com.djrapitops.plan.Plan;
-import com.djrapitops.plandebugger.PlanDebugger;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Rsl1122
- */
-public class PluginTestRunner extends TestRunner {
-
-    private List<Test> tests;
-    
-    public PluginTestRunner(PlanDebugger debug, Plan plan) {
-        super(debug, plan);
-    }
-        
-    @Override
-    public List<String> runAllTests() {
-        List<String> errors = new ArrayList<>();
-        for (Test test : tests) {
-            try {
-                test.runTest();
-            } catch (Exception e) {
-                String msg = "Test "+test.getTestName()+" ran into ERROR: "+e.getMessage();
-                debug.logError(msg);
-                for (StackTraceElement x : e.getStackTrace()) {
-                    debug.toLog(x+"");
-                }
-                errors.add(msg);
-            }
-        }
-        return errors;
-    } 
-    
-}
diff --git a/PlanDebugger/src/com/djrapitops/plandebugger/tests/Test.java b/PlanDebugger/src/com/djrapitops/plandebugger/tests/Test.java
deleted file mode 100644
index dec560b36a..0000000000
--- a/PlanDebugger/src/com/djrapitops/plandebugger/tests/Test.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package com.djrapitops.plandebugger.tests;
-
-import com.djrapitops.plan.Plan;
-import com.djrapitops.plandebugger.PlanDebugger;
-
-/**
- *
- * @author Rsl1122
- */
-public abstract class Test {
-    Plan plan;
-    PlanDebugger debug;
-    private String testName;
-
-    public Test(Plan plan, PlanDebugger debug, String testName) {
-        this.plan = plan;
-        this.debug = debug;
-    }
-    
-    public abstract boolean runTest() throws Exception;
-    
-    public void pass() {
-        debug.log("Test "+testName+": PASSED");
-    }
-    
-    public void fail() {
-        debug.logError("Test "+testName+": FAILED");
-    }
-
-    public String getTestName() {
-        return testName;
-    }
-    
-}
diff --git a/PlanDebugger/src/com/djrapitops/plandebugger/tests/TestRunner.java b/PlanDebugger/src/com/djrapitops/plandebugger/tests/TestRunner.java
deleted file mode 100644
index dd648f1917..0000000000
--- a/PlanDebugger/src/com/djrapitops/plandebugger/tests/TestRunner.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.djrapitops.plandebugger.tests;
-
-import com.djrapitops.plan.Plan;
-import com.djrapitops.plandebugger.PlanDebugger;
-import java.util.List;
-
-/**
- *
- * @author Rsl1122
- */
-public abstract class TestRunner {
-    Plan plan;
-    PlanDebugger debug;
-    private int testsRun;
-    private int testsFailed;
-    private int testsError;
-
-    public TestRunner(PlanDebugger debug, Plan plan) {
-        this.plan = plan;
-        this.debug = debug;
-        testsRun = 0;
-        testsFailed = 0;
-        testsError = 0;
-    }
-    
-    public abstract List<String> runAllTests();
-
-    public int getTestsRun() {
-        return testsRun;
-    }
-
-    public int getTestsFailed() {
-        return testsFailed;
-    }
-
-    public int getTestsError() {
-        return testsError;
-    }
-    
-    
-}
diff --git a/PlanDebugger/src/plugin.yml b/PlanDebugger/src/plugin.yml
deleted file mode 100644
index f657f87caa..0000000000
--- a/PlanDebugger/src/plugin.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: PlanDebugger
-main: com.djrapitops.plandebugger.PlanDebugger
-author: Rsl1122
-version: 2.5.1
-    
-depend:
-- Plan
\ No newline at end of file