diff --git a/lib/capi.jar b/lib/capi.jar
deleted file mode 100644
index 7659562e..00000000
Binary files a/lib/capi.jar and /dev/null differ
diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java
index 9cc7a26a..460f0919 100644
--- a/src/com/massivecraft/factions/Factions.java
+++ b/src/com/massivecraft/factions/Factions.java
@@ -17,7 +17,6 @@ import com.massivecraft.factions.adapters.FPermTypeAdapter;
 import com.massivecraft.factions.adapters.LocationTypeAdapter;
 import com.massivecraft.factions.adapters.RelTypeAdapter;
 import com.massivecraft.factions.cmd.*;
-import com.massivecraft.factions.integration.capi.CapiFeatures;
 import com.massivecraft.factions.integration.herochat.HerochatFeatures;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.integration.EssentialsFeatures;
@@ -113,7 +112,6 @@ public class Factions extends MPlugin
 		EssentialsFeatures.setup();
 		SpoutFeatures.setup();
 		Econ.setup();
-		CapiFeatures.setup();
 		HerochatFeatures.setup();
 		LWCFeatures.setup();
 		
diff --git a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java b/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
deleted file mode 100644
index e8fcdb4f..00000000
--- a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.massivecraft.factions.integration.capi;
-
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-
-import com.massivecraft.factions.Factions;
-
-public class CapiFeatures
-{
-	public static void setup()
-	{
-		Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("capi");
-		if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.P"))
-		{
-			Factions.p.log("Integration with the CAPI plugin was successful");
-			Bukkit.getPluginManager().registerEvents(new PluginCapiListener(Factions.p), Factions.p);
-		}
-	}
-}
diff --git a/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java b/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
deleted file mode 100644
index 7c25f5e9..00000000
--- a/src/com/massivecraft/factions/integration/capi/PluginCapiListener.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.massivecraft.factions.integration.capi;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-
-import com.massivecraft.capi.Channel;
-import com.massivecraft.capi.Channels;
-import com.massivecraft.capi.events.CAPIListChannelsEvent;
-import com.massivecraft.capi.events.CAPIMessageToChannelEvent;
-import com.massivecraft.capi.events.CAPIMessageToPlayerEvent;
-import com.massivecraft.capi.events.CAPISelectChannelEvent;
-import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.FPlayers;
-import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.Factions;
-import com.massivecraft.factions.struct.Rel;
-
-public class PluginCapiListener implements Listener
-{
-	Factions p;
-	
-	Set<String> myChannelIds = new LinkedHashSet<String>();
-	
-	public PluginCapiListener(Factions p)
-	{
-		this.p = p;
-		
-		myChannelIds.add("faction");
-		myChannelIds.add("allies");
-	}
-	
-	private String replacePlayerTags(String format, FPlayer me, FPlayer you)
-	{
-		String meFactionTag = me.getChatTag(you);
-		format = format.replace("{ME_FACTIONTAG}",      meFactionTag.length() == 0 ? "" : meFactionTag);
-		format = format.replace("{ME_FACTIONTAG_PADR}", meFactionTag.length() == 0 ? "" : meFactionTag+" ");
-		format = format.replace("{ME_FACTIONTAG_PADL}", meFactionTag.length() == 0 ? "" : " "+meFactionTag);
-		format = format.replace("{ME_FACTIONTAG_PADB}", meFactionTag.length() == 0 ? "" : " "+meFactionTag+" ");
-
-		String youFactionTag = you.getChatTag(me);
-		format = format.replace("{YOU_FACTIONTAG}",      youFactionTag.length() == 0 ? "" : youFactionTag);
-		format = format.replace("{YOU_FACTIONTAG_PADR}", youFactionTag.length() == 0 ? "" : youFactionTag+" ");
-		format = format.replace("{YOU_FACTIONTAG_PADL}", youFactionTag.length() == 0 ? "" : " "+youFactionTag);
-		format = format.replace("{YOU_FACTIONTAG_PADB}", youFactionTag.length() == 0 ? "" : " "+youFactionTag+" ");
-		
-		return format;
-	}
-	
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onListChannelsEvent(CAPIListChannelsEvent event)
-	{
-		for (Channel c : Channels.i.getAll())
-		{
-			if (myChannelIds.contains(c.getId()))
-			{
-				event.getChannels().add(c);
-			}
-		}
-	}
-	
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onMessageToChannel(CAPIMessageToChannelEvent event)
-	{
-		if (event.isCancelled()) return;
-		if ( ! myChannelIds.contains(event.getChannel().getId())) return;
-		
-		Player me = event.getMe();
-		FPlayer fme = FPlayers.i.get(me);
-		Faction myFaction = fme.getFaction();
-		
-		if (event.getChannel().getId().equals("faction") && myFaction.isNormal())
-		{
-			event.getThem().addAll(myFaction.getOnlinePlayers());
-		}
-		else if (event.getChannel().getId().equals("allies"))
-		{
-			for (Player somePlayer : Bukkit.getServer().getOnlinePlayers())
-			{
-				FPlayer someFPlayer = FPlayers.i.get(somePlayer);
-				if (someFPlayer.getRelationTo(fme).isAtLeast(Rel.ALLY))
-					event.getThem().add(somePlayer);
-			}
-		}
-	}
-	
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onMessageToPlayer(CAPIMessageToPlayerEvent event)
-	{
-		if (event.isCancelled()) return;
-		event.setFormat(this.replacePlayerTags(event.getFormat(), FPlayers.i.get(event.getMe()), FPlayers.i.get(event.getYou())));
-	}
-	
-	@EventHandler(priority = EventPriority.NORMAL)
-	public void onSelectChannel(CAPISelectChannelEvent event)
-	{
-		if (event.isCancelled()) return;
-		String channelId = event.getChannel().getId();
-		if ( ! myChannelIds.contains(channelId)) return;
-		
-		Player me = event.getMe();
-		FPlayer fme = FPlayers.i.get(me);
-		
-		if ( ! fme.hasFaction())
-		{
-			event.setFailMessage(p.txt.parse("<b>You must be member in a faction to use this channel."));
-			event.setCancelled(true);
-		}
-	}
-}