diff --git a/build.xml b/build.xml
index f3d873f6d..a782fc589 100644
--- a/build.xml
+++ b/build.xml
@@ -19,13 +19,6 @@
 				<pathelement location="${lib}/bukkit-1.2.2-R0.1-SNAPSHOT.jar" />
 				<pathelement location="${lib}/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar" />
 				<pathelement location="${lib}/CitizensAPI.jar" />
-				<pathelement location="${lib}/hamcrest.jar" />
-				<pathelement location="${lib}/junit-dep-4.10.jar" />
-				<pathelement location="${lib}/hamcrest-library-1.2.1.jar" />
-				<pathelement location="${lib}/hamcrest-core-1.2.1.jar" />
-				<fileset dir="lib">
-					<include name="CitizensAPI.jar" />
-				</fileset>
 			</classpath>
 		</javac>
 		<antcall target="distcore" />
diff --git a/lib/hamcrest-core-1.2.1.jar b/lib/hamcrest-core-1.2.1.jar
deleted file mode 100644
index a590fd864..000000000
Binary files a/lib/hamcrest-core-1.2.1.jar and /dev/null differ
diff --git a/lib/hamcrest-library-1.2.1.jar b/lib/hamcrest-library-1.2.1.jar
deleted file mode 100644
index c7e961ab1..000000000
Binary files a/lib/hamcrest-library-1.2.1.jar and /dev/null differ
diff --git a/lib/junit-dep-4.10.jar b/lib/junit-dep-4.10.jar
deleted file mode 100644
index 32209cb13..000000000
Binary files a/lib/junit-dep-4.10.jar and /dev/null differ
diff --git a/src/main/java/net/citizensnpcs/EventListen.java b/src/main/java/net/citizensnpcs/EventListen.java
index ef34b8237..3834cdd63 100644
--- a/src/main/java/net/citizensnpcs/EventListen.java
+++ b/src/main/java/net/citizensnpcs/EventListen.java
@@ -113,8 +113,9 @@ public class EventListen implements Listener {
                     return;
             }
         }
-        if ((player.hasPermission("citizens.npc.talk") || player.hasPermission("citizens.admin"))
-                && player.getItemInHand().getTypeId() == Setting.TALK_ITEM.asInt())
+        // If the NPC isn't a close talker
+        if (player.getItemInHand().getTypeId() == Setting.TALK_ITEM.asInt()
+                && !npc.getTrait(Text.class).shouldTalkClose())
             npc.getTrait(Text.class).sendText(player);
 
         if (npc.getCharacter() != null)
diff --git a/src/main/java/net/citizensnpcs/trait/text/Text.java b/src/main/java/net/citizensnpcs/trait/text/Text.java
index c2290d148..a56128c37 100644
--- a/src/main/java/net/citizensnpcs/trait/text/Text.java
+++ b/src/main/java/net/citizensnpcs/trait/text/Text.java
@@ -101,6 +101,10 @@ public class Text extends Trait implements Runnable, Toggleable {
         return builder.toString();
     }
 
+    public boolean shouldTalkClose() {
+        return talkClose;
+    }
+
     public Editor getEditor(final Player player) {
         final StartPrompt startPrompt = new StartPrompt(this);
         return new Editor() {
@@ -146,6 +150,8 @@ public class Text extends Trait implements Runnable, Toggleable {
     }
 
     public boolean sendText(Player player) {
+        if (!player.hasPermission("citizens.admin") && !player.hasPermission("citizens.npc.talk"))
+            return false;
         if (text.size() == 0)
             return false;
 
@@ -157,8 +163,6 @@ public class Text extends Trait implements Runnable, Toggleable {
                 currentIndex = 0;
             index = currentIndex++;
         }
-        Messaging.log("current: " + currentIndex);
-        Messaging.log("index: " + index);
         npc.chat(player, text.get(index));
         return true;
     }