diff --git a/pom.xml b/pom.xml
index bd38114..621b0d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     </properties>
     <build>
         <finalName>${project.artifactId}</finalName>
-        <defaultGoal>clean package install</defaultGoal>
+        <defaultGoal>clean package</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/com/liteflags/LiteFlags.java b/src/main/java/com/liteflags/LiteFlags.java
index 4bb6fd5..dbb92c8 100644
--- a/src/main/java/com/liteflags/LiteFlags.java
+++ b/src/main/java/com/liteflags/LiteFlags.java
@@ -18,12 +18,12 @@ public class LiteFlags extends JavaPlugin {
    public void onEnable() {
       instance = this;
       this.saveDefaultConfig();
-      this.getCommand("flag").setExecutor(new FlagCMD(this));
-      this.getCommand("flaglist").setExecutor(new FlagCMD(this));
-      this.getServer().getPluginManager().registerEvents(new LoginEvent(this), this);
-      this.getServer().getPluginManager().registerEvents(new LogoutEvent(this), this);
-      this.getServer().getPluginManager().registerEvents(new ChatEvent(this), this);
-      this.getServer().getPluginManager().registerEvents(new MoveEvent(this), this);
+      this.getCommand("flag").setExecutor(new FlagCMD());
+      this.getCommand("flaglist").setExecutor(new FlagCMD());
+      this.getServer().getPluginManager().registerEvents(new LoginEvent(), this);
+      this.getServer().getPluginManager().registerEvents(new LogoutEvent(), this);
+      this.getServer().getPluginManager().registerEvents(new ChatEvent(), this);
+      this.getServer().getPluginManager().registerEvents(new MoveEvent(), this);
 
       try {
          DatabaseConnection var10000 = this.database;
diff --git a/src/main/java/com/liteflags/commands/FlagCMD.java b/src/main/java/com/liteflags/commands/FlagCMD.java
index e8e246d..372d190 100644
--- a/src/main/java/com/liteflags/commands/FlagCMD.java
+++ b/src/main/java/com/liteflags/commands/FlagCMD.java
@@ -27,11 +27,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 public class FlagCMD implements CommandExecutor {
-    private LiteFlags flags;
-
-    public FlagCMD(LiteFlags flags) {
-        this.flags = flags;
-    }
 
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
         OfflinePlayer target;
@@ -234,22 +229,22 @@ public class FlagCMD implements CommandExecutor {
                             }
 
                             String s = (String) var20.next();
-                            s = s.replaceFirst("%player%", targetPlayer.getName());
-                            s = s.replaceFirst("%staff%", flaggedBy);
-                            s = s.replaceFirst("%flaglength%", flagLength);
-                            s = s.replaceFirst("%reason%", reason);
-                            s = s.replaceFirst("%flagtime%", Utilities.convertTime(convertedFlaggedTime));
+                            s = s.replace("%player%", targetPlayer.getName());
+                            s = s.replace("%staff%", flaggedBy);
+                            s = s.replace("%flaglength%", flagLength);
+                            s = s.replace("%reason%", reason);
+                            s = s.replace("%flagtime%", Utilities.convertTime(convertedFlaggedTime));
                             if (expireTime != 0L) {
-                                s = s.replaceFirst("%expiretime%", Utilities.convertTime(convertedExpireTime));
+                                s = s.replace("%expiretime%", Utilities.convertTime(convertedExpireTime));
                             }
 
-                            s = s.replaceFirst("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()));
-                            s = s.replaceFirst("%nl%", " ");
+                            s = s.replace("%limit%", "" + Database.countFlags(targetPlayer.getUniqueId()));
+                            s = s.replace("%nl%", " ");
                             if (convertedExpireTime < 0 && expireTime != 0L) {
-                                s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"));
+                                s = s.replace("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ExpiredFlags"));
                                 mainComponent = new TextComponent(Utilities.format(s));
                             } else {
-                                s = s.replaceFirst("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags"));
+                                s = s.replace("%active%", LiteFlags.getInstance().getConfig().getString("Messages.ActiveFlags"));
                                 mainComponent = new TextComponent(Utilities.format(s));
                             }
 
diff --git a/src/main/java/com/liteflags/events/LogoutEvent.java b/src/main/java/com/liteflags/events/LogoutEvent.java
index 6ab6a65..da26e48 100644
--- a/src/main/java/com/liteflags/events/LogoutEvent.java
+++ b/src/main/java/com/liteflags/events/LogoutEvent.java
@@ -10,11 +10,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 public class LogoutEvent implements Listener {
-    private LiteFlags flags;
-
-    public LogoutEvent(LiteFlags flags) {
-        this.flags = flags;
-    }
 
     @EventHandler
     public void onPlayerLogout(PlayerQuitEvent e) {