diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
index b4559c9b..69134f96 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
@@ -90,9 +90,6 @@ public class ChatManager extends FreedomService
             return;
         }
 
-        // Check for mentions
-        checkMentions(message);
-
         // Finally, set message
         event.setMessage(message);
 
@@ -109,28 +106,6 @@ public class ChatManager extends FreedomService
         event.setFormat(format);
     }
 
-    public void checkMentions(String message)
-    {
-        checkMentions(message, false);
-    }
-
-    public void checkMentions(String message, boolean adminOnly)
-    {
-        for (Player player : server.getOnlinePlayers())
-        {
-            // This is so if admins for some reason mention non-admins in admin chat, they won't be notified
-            if (adminOnly && !plugin.al.isAdmin(player))
-            {
-                return;
-            }
-
-            if (ChatColor.stripColor(message).toLowerCase().contains("@" + player.getName().toLowerCase()))
-            {
-                player.playSound(player.getLocation(), Sound.BLOCK_NOTE_PLING, SoundCategory.PLAYERS, 100F, 0.9F);
-            }
-        }
-    }
-
     public String getOldPrefix(Displayable display)
     {
         ChatColor color = display.getColor();
@@ -153,7 +128,6 @@ public class ChatManager extends FreedomService
     {
         Displayable display = plugin.rm.getDisplay(sender);
         FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message);
-        checkMentions(message, true);
 
         for (Player player : server.getOnlinePlayers())
         {
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/Updater.java b/src/main/java/me/totalfreedom/totalfreedommod/Updater.java
index 839f26e7..7330f432 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/Updater.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/Updater.java
@@ -88,14 +88,7 @@ public class Updater extends FreedomService
             player.kickPlayer("The server is restarting for a TFM update.");
         }
 
-        if (!plugin.amp.enabled)
-        {
-            server.shutdown();
-        }
-        else
-        {
-            plugin.amp.restartServer();
-        }
+        server.shutdown();
     }
     public String getFilePath()
     {
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
index 47d4c7c6..06691130 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
@@ -21,7 +21,6 @@ public class Command_consolesay extends FreedomCommand
         }
 
         String message = StringUtils.join(args, " ");
-        plugin.cm.checkMentions(message);
         FUtil.bcastMsg(String.format("§7[CONSOLE] §f<§c%s§f> %s", sender.getName(), StringUtils.join(args, " ")));
         return true;
     }
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_expel.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_expel.java
index 4c847354..0285ff05 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_expel.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_expel.java
@@ -11,7 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Push people away from you.", usage = "/<command> [radius] [strength]")
 public class Command_expel extends FreedomCommand
 {
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java
index cb774161..4d5e8211 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java
@@ -40,8 +40,6 @@ public class Command_say extends FreedomCommand
             }
         }
 
-        plugin.cm.checkMentions(message);
-
         FUtil.bcastMsg(String.format("[Server:%s] %s", sender.getName(), message), ChatColor.LIGHT_PURPLE);
 
         return true;