diff --git a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java b/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java
index 466859e..762ebd1 100644
--- a/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java
+++ b/src/alisolarflare/components/creativeboundaries/CreativeBoundariesComponent.java
@@ -10,7 +10,6 @@ import alisolarflare.components.Component;
 import alisolarflare.components.creativeboundaries.commands.Cbgm0;
 import alisolarflare.components.creativeboundaries.commands.Cbgm1;
 import alisolarflare.components.creativeboundaries.commands.SetDickmode;
-import alisolarflare.components.creativeboundaries.listeners.ItemRestrictionListener;
 import alisolarflare.components.creativeboundaries.listeners.PlotChangeListener;
 
 
diff --git a/src/alisolarflare/components/creativeboundaries/listeners/ItemRestrictionListener.java b/src/alisolarflare/components/creativeboundaries/listeners/ItemRestrictionListener.java
index 8b09d5a..ffb9a3d 100644
--- a/src/alisolarflare/components/creativeboundaries/listeners/ItemRestrictionListener.java
+++ b/src/alisolarflare/components/creativeboundaries/listeners/ItemRestrictionListener.java
@@ -2,13 +2,5 @@ package alisolarflare.components.creativeboundaries.listeners;
 
 import org.bukkit.event.Listener;
 
-import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
-
 public class ItemRestrictionListener implements Listener {
-
-	private CreativeBoundariesComponent module;
-
-	public ItemRestrictionListener(CreativeBoundariesComponent module) {
-		this.module = module;
-	}
 }
diff --git a/src/alisolarflare/components/metrics/MetricsModule.java b/src/alisolarflare/components/metrics/MetricsModule.java
index 4672898..e758136 100644
--- a/src/alisolarflare/components/metrics/MetricsModule.java
+++ b/src/alisolarflare/components/metrics/MetricsModule.java
@@ -3,7 +3,6 @@ package alisolarflare.components.metrics;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.List;
 
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -15,7 +14,6 @@ import alisolarflare.components.Component;
 public class MetricsModule extends Component{
 
 	public FileConfiguration metricsYml;
-	private List<String> playerList;
 
 	@Override
 	public void register(JavaPlugin plugin){
diff --git a/src/graveyard/autouhc/intro/StartMatch.java b/src/graveyard/autouhc/intro/StartMatch.java
index 26a6948..dfc4f54 100644
--- a/src/graveyard/autouhc/intro/StartMatch.java
+++ b/src/graveyard/autouhc/intro/StartMatch.java
@@ -6,6 +6,7 @@ import alisolarflare.components.ModCommand;
 import graveyard.autouhc.memory.MatchState;
 import graveyard.autouhc.memory.UHCMatch;
 
+/**@deprecated*/
 public class StartMatch extends ModCommand {
 	private UHCMatch match;
 	/**@deprecated*/
diff --git a/src/graveyard/autouhc/memory/UHCMatch.java b/src/graveyard/autouhc/memory/UHCMatch.java
index a5f4538..3bbf260 100644
--- a/src/graveyard/autouhc/memory/UHCMatch.java
+++ b/src/graveyard/autouhc/memory/UHCMatch.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
 
 /**@deprecated*/
@@ -14,12 +13,6 @@ public class UHCMatch {
 	private List<String> playerList = new ArrayList<String>();
 	
 	private Location lobbyLocation;
-	private Location spawnLocation;
-	
-	private World ultraHardcoreWorld;
-	
-	private int worldBorderMaxRadius;
-	private int worldBorderMinRadius;
 	public UHCMatch(FileConfiguration fileConfiguration, MatchState state) {
 		this.config = fileConfiguration;
 		this.matchState = state;