diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
index 94148408..36fc170d 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
@@ -1,6 +1,5 @@
 package com.sekwah.advancedportals;
 
-import com.sekwah.advancedportals.DataCollector.DataCollector;
 import com.sekwah.advancedportals.compat.CraftBukkit;
 import com.sekwah.advancedportals.destinations.*;
 import com.sekwah.advancedportals.effects.WarpEffects;
@@ -37,8 +36,6 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
             new Portal(this);
             new Destination(this);
 
-            new DataCollector(this);
-
 
             this.registerCommands();
 
@@ -87,8 +84,6 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
 
     private void setupDataCollector() {
         Selection.LoadData(this);
-
-        DataCollector.setupMetrics();
     }
 
     private void setupBungee() {
diff --git a/src/com/sekwah/advancedportals/DataCollector/DataCollector.java b/src/com/sekwah/advancedportals/DataCollector/DataCollector.java
deleted file mode 100644
index e80a3fe1..00000000
--- a/src/com/sekwah/advancedportals/DataCollector/DataCollector.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.sekwah.advancedportals.DataCollector;
-
-import com.sekwah.advancedportals.AdvancedPortalsPlugin;
-import com.sekwah.advancedportals.metrics.Metrics;
-import com.sekwah.advancedportals.metrics.Metrics.Graph;
-
-import java.io.IOException;
-import java.util.logging.Level;
-
-public class DataCollector {
-
-    private static AdvancedPortalsPlugin plugin;
-
-    public DataCollector(AdvancedPortalsPlugin plugin) {
-        DataCollector.plugin = plugin;
-    }
-
-    /**
-     *
-     * This is currently being tested as it doesn't fully work at the moment.
-     *
-     */
-
-    /**
-     * public static void playerWarped() {
-     * try {
-     * Metrics metrics = new Metrics(plugin);
-     * <p>
-     * Graph TotalWarps = metrics.createGraph("Total Warps");
-     * <p>
-     * TotalWarps.addPlotter(new Metrics.Plotter("Internal Warps") {
-     *
-     * @Override public int getValue() {
-     * return 1; // number of warps
-     * }
-     * <p>
-     * });
-     * <p>
-     * metrics.start();
-     * } catch (IOException e) {
-     * plugin.getLogger().log(Level.SEVERE, "Could not submit data", e);
-     * }
-     * }
-     */
-
-    public static void setupMetrics() {
-
-        try {
-            Metrics metrics = new Metrics(plugin);
-            Graph TotalWarps = metrics.createGraph("Portal Trigger Blocks");
-
-            /**List<Material> MaterialList = new ArrayList<Material>();
-             for(AdvancedPortal portal : Portal.portals){
-             MaterialList.add(portal.trigger);
-             }*/
-
-            /**TotalWarps.addPlotter(new Metrics.Plotter(triggerName) {
-
-            @Override public int getValue() {
-            return 1; // number of portals created
-            }
-
-            });*/
-
-        } catch (IOException e) {
-            plugin.getLogger().log(Level.SEVERE, "Could not submit data", e);
-        }
-    }
-
-}