diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
index 7c155e0..16faf55 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
@@ -41,13 +41,13 @@ import mineverse.Aust1n46.chat.listeners.LoginListener;
 import mineverse.Aust1n46.chat.listeners.ChatListener;
 import mineverse.Aust1n46.chat.listeners.PacketListener;
 import mineverse.Aust1n46.chat.listeners.SignListener;
-import mineverse.Aust1n46.chat.alias.Alias;
+//import mineverse.Aust1n46.chat.alias.Alias;
 import mineverse.Aust1n46.chat.alias.AliasInfo;
 import mineverse.Aust1n46.chat.api.MineverseChatAPI;
 import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
 import mineverse.Aust1n46.chat.channel.ChatChannel;
 import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
-import mineverse.Aust1n46.chat.command.CCommand;
+//import mineverse.Aust1n46.chat.command.CCommand;
 import mineverse.Aust1n46.chat.command.MineverseCommand;
 import mineverse.Aust1n46.chat.command.MineverseCommandExecutor;
 import mineverse.Aust1n46.chat.command.chat.Broadcast;
@@ -136,7 +136,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 	public static String lastJson;
 	public static Method messageMethod;
 	public static Field posField;
-	public static Class chatMessageType;
+	public static Class<?> chatMessageType;
 	private static Field commandMap;
 	private static Field knownCommands;
 
diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java
index 70c8e04..540d492 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java
@@ -81,8 +81,8 @@ public class Removemessage extends MineverseCommand {
 							resend = true;
 							continue;
 						}
-						if(message.getMessage().contains(Format.FormatStringAll(plugin.getConfig().getString("guiicon")))) {
-							String submessage = message.getMessage().substring(0, message.getMessage().length() - plugin.getConfig().getString("guiicon").length() - 1).replaceAll("(§([a-z0-9]))", "");
+						if(message.getMessage().contains(ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))))) {
+							String submessage = message.getMessage().substring(0, message.getMessage().length() - ChatColor.stripColor(Format.FormatStringAll(plugin.getConfig().getString("guiicon"))).length());
 							if(submessage.hashCode() == hash) {
 								WrappedChatComponent removedComponent = p.getPlayer().hasPermission("venturechat.message.bypass") ? Removemessage.this.getMessageDeletedChatComponentAdmin(message) : Removemessage.this.getMessageDeletedChatComponentPlayer();
 								message.setComponent(removedComponent);
@@ -148,7 +148,6 @@ public class Removemessage extends MineverseCommand {
 						for(Player p : packets.keySet()) {
 							List<PacketContainer> pPackets = packets.get(p);
 							for(PacketContainer c : pPackets) {
-								//System.out.println("test packet send");
 								Removemessage.this.sendPacketPlayOutChat(p, c);
 							}
 						}