diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
index df33395..69de02a 100644
--- a/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
+++ b/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
@@ -41,7 +41,6 @@ public class PlayerManager extends Manager {
     super();
     players = new HashMap<>();
     actionBarTasks = new HashMap<>();
-    Bukkit.getPluginManager().registerEvents(this, SR.getInstance());
   }
 
   /** Save the data */
@@ -81,7 +80,6 @@ public class PlayerManager extends Manager {
     players.remove(uuid);
   }
 
-  @SuppressWarnings("unused")
   public boolean isSRPlayer(UUID uuid) {
     return players.containsKey(uuid);
   }
@@ -112,21 +110,18 @@ public class PlayerManager extends Manager {
       return;
     }
     if (srPlayer.isFirstTime()) {
-      Bukkit.getServer()
-          .broadcast(
-              textComp(
-                  "<gold>"
-                      + e.getPlayer().getName()
-                      + " has joined for "
-                      + "the first time!<newline><gold>Welcome to "
-                      + "the "
-                      + "server!"));
+      e.joinMessage(
+          textComp(
+              "<gold>"
+                  + e.getPlayer().getName()
+                  + " has joined for "
+                  + "the first time!<newline><gold>Welcome to "
+                  + "the "
+                  + "server!"));
     } else {
-      Bukkit.getServer()
-          .broadcast(
-              textComp(
-                  "<gray>[</gray><green>+</green><gray>]</gray> <white>"
-                      + e.getPlayer().getName()));
+      e.joinMessage(
+          textComp(
+              "<gray>[</gray><green>+</green><gray>]</gray> <white>" + e.getPlayer().getName()));
     }
     addPlayer(srPlayer);
 
@@ -139,7 +134,7 @@ public class PlayerManager extends Manager {
     BukkitTask task =
         Bukkit.getScheduler()
             .runTaskTimerAsynchronously(
-                SR.getInstance(), () -> updateActionBar(e.getPlayer(), srPlayer), 0, 20L);
+                SR.getInstance(), () -> updateActionBar(e.getPlayer()), 0, 20L);
 
     actionBarTasks.put(e.getPlayer().getUniqueId(), task);
     e.getPlayer().updateInventory();