diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java
index ff24e8d3c..d3ebd3a15 100644
--- a/src/main/java/noppes/npcs/PacketHandlerServer.java
+++ b/src/main/java/noppes/npcs/PacketHandlerServer.java
@@ -102,7 +102,7 @@ public class PacketHandlerServer{
 				NBTTagCompound compound = new NBTTagCompound();
 				NBTTagList tagList = new NBTTagList();
 				for (UUID uuid : npc.advanced.tagUUIDs) {
-					Tag tag = TagController.getInstance().getTagFromUUID(uuid);
+					Tag tag = TagController.getInstance().get(uuid);
 					if (tag != null) {
 						tagList.appendTag(new NBTTagString(tag.name));
 					}
@@ -762,7 +762,7 @@ public class PacketHandlerServer{
 			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
 		}
 		else if(type == EnumPacketServer.TagSet){
-			npc.advanced.tagUUIDs.removeIf(uuid -> TagController.getInstance().getTagFromUUID(uuid) != null);
+			npc.advanced.tagUUIDs.removeIf(uuid -> TagController.getInstance().get(uuid) != null);
 			NBTTagCompound compound = Server.readNBT(buffer);
 			NBTTagList list = compound.getTagList("TagNames",8);
 			for (int i = 0; i < list.tagCount(); i++) {
@@ -1000,7 +1000,7 @@ public class PacketHandlerServer{
 			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
 		}
 		else
-			warn(player,"tried todo something with the wrong tool, probably a hacker");
+			warn(player,"WE 1 tried todo something with the wrong tool, probably a hacker");
 	}
 
 	private void clonePackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException {
@@ -1092,7 +1092,7 @@ public class PacketHandlerServer{
 			Server.sendData(player, EnumPacketClient.GUI_DATA, compound);
 		}
 		else
-			warn(player,"tried todo something with the wrong tool, probably a hacker");
+			warn(player,"WE 2 tried todo something with the wrong tool, probably a hacker");
 	}
 
 	private void warn(EntityPlayer player, String warning){
diff --git a/src/main/java/noppes/npcs/controllers/TagController.java b/src/main/java/noppes/npcs/controllers/TagController.java
index 50b8a724d..213e8f5a7 100644
--- a/src/main/java/noppes/npcs/controllers/TagController.java
+++ b/src/main/java/noppes/npcs/controllers/TagController.java
@@ -203,14 +203,6 @@ public class TagController implements ITagHandler {
 		}
 	}
 
-	public int getFirstTagId() {
-		return tags.keySet().iterator().next();
-	}
-
-	public Tag getFirstTag() {
-		return tags.values().iterator().next();
-	}
-
 	public boolean hasName(String newName) {
 		if(newName.trim().isEmpty())
 			return true;
@@ -239,15 +231,6 @@ public class TagController implements ITagHandler {
 		return names;
 	}
 
-	public Tag getTagFromUUID(UUID uuid){
-		for (Map.Entry<Integer,Tag> entryTag: TagController.getInstance().tags.entrySet()){
-			if (entryTag.getValue().uuid.equals(uuid)) {
-				return entryTag.getValue();
-			}
-		}
-		return null;
-	}
-
 	public HashSet<Tag> getValidTags(TagMap tagMap){
 		HashSet<Tag> tags = new HashSet<Tag>();
 		for(UUID tagUUID : tagMap.getAllUUIDs()){