diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
index dbba473f..4fa6effd 100644
Binary files a/lib/craftbukkit.jar and b/lib/craftbukkit.jar differ
diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java
index 478916a8..d6e92a6a 100644
--- a/src/com/massivecraft/factions/Conf.java
+++ b/src/com/massivecraft/factions/Conf.java
@@ -305,6 +305,9 @@ public class Conf
 		materialsContainer.add(Material.ENCHANTMENT_TABLE);
 		materialsContainer.add(Material.ANVIL);
 		materialsContainer.add(Material.BEACON);
+		materialsContainer.add(Material.TRAPPED_CHEST);
+		materialsContainer.add(Material.DROPPER);
+		materialsContainer.add(Material.HOPPER);
 		
 		materialsEditOnInteract.add(Material.DIODE_BLOCK_OFF);
 		materialsEditOnInteract.add(Material.DIODE_BLOCK_ON);
diff --git a/src/com/massivecraft/factions/FPlayers.java b/src/com/massivecraft/factions/FPlayers.java
index cb3fb0e1..5480b344 100644
--- a/src/com/massivecraft/factions/FPlayers.java
+++ b/src/com/massivecraft/factions/FPlayers.java
@@ -47,35 +47,4 @@ public class FPlayers extends PlayerEntityCollection<FPlayer>
 			}
 		}
 	}
-	
-	public void autoLeaveOnInactivityRoutine()
-	{
-		if (Conf.autoLeaveAfterDaysOfInactivity <= 0.0)
-		{
-			return;
-		}
-
-		long now = System.currentTimeMillis();
-		double toleranceMillis = Conf.autoLeaveAfterDaysOfInactivity * 24 * 60 * 60 * 1000;
-		
-		for (FPlayer fplayer : FPlayers.i.get())
-		{
-			if (fplayer.isOffline() && now - fplayer.getLastLoginTime() > toleranceMillis)
-			{
-				if (Conf.logFactionLeave || Conf.logFactionKick)
-					P.p.log("Player "+fplayer.getName()+" was auto-removed due to inactivity.");
-
-				// if player is faction leader, sort out the faction since he's going away
-				if (fplayer.getRole() == Rel.LEADER)
-				{
-					Faction faction = fplayer.getFaction();
-					if (faction != null)
-						fplayer.getFaction().promoteNewLeader();
-				}
-
-				fplayer.leave(false);
-				fplayer.detach();
-			}
-		}
-	}
 }