diff --git a/src/main/java/client/command/commands/gm2/JailCommand.java b/src/main/java/client/command/commands/gm2/JailCommand.java
index 9cb25ff515..55c5ae82f7 100644
--- a/src/main/java/client/command/commands/gm2/JailCommand.java
+++ b/src/main/java/client/command/commands/gm2/JailCommand.java
@@ -44,7 +44,7 @@ public class JailCommand extends Command {
 
         int minutesJailed = 5;
         if (params.length >= 2) {
-            minutesJailed = Integer.valueOf(params[1]);
+            minutesJailed = Integer.parseInt(params[1]);
             if (minutesJailed <= 0) {
                 player.yellowMessage("Syntax: !jail <playername> [<minutes>]");
                 return;
diff --git a/src/main/java/client/command/commands/gm3/HpMpCommand.java b/src/main/java/client/command/commands/gm3/HpMpCommand.java
index b23502f58a..c67a199faa 100644
--- a/src/main/java/client/command/commands/gm3/HpMpCommand.java
+++ b/src/main/java/client/command/commands/gm3/HpMpCommand.java
@@ -40,9 +40,9 @@ public class HpMpCommand extends Command {
 
         if (params.length == 2) {
             victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
-            statUpdate = Integer.valueOf(params[1]);
+            statUpdate = Integer.parseInt(params[1]);
         } else if (params.length == 1) {
-            statUpdate = Integer.valueOf(params[0]);
+            statUpdate = Integer.parseInt(params[0]);
         } else {
             player.yellowMessage("Syntax: !hpmp [<playername>] <value>");
         }
diff --git a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java
index 9b9a0e116e..7100dcbf84 100644
--- a/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java
+++ b/src/main/java/client/command/commands/gm3/MaxHpMpCommand.java
@@ -40,9 +40,9 @@ public class MaxHpMpCommand extends Command {
         int statUpdate = 1;
         if (params.length >= 2) {
             victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
-            statUpdate = Integer.valueOf(params[1]);
+            statUpdate = Integer.parseInt(params[1]);
         } else if (params.length == 1) {
-            statUpdate = Integer.valueOf(params[0]);
+            statUpdate = Integer.parseInt(params[0]);
         } else {
             player.yellowMessage("Syntax: !maxhpmp [<playername>] <value>");
         }
diff --git a/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java b/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java
index fd0679f74e..2d3720c712 100644
--- a/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java
+++ b/src/main/java/net/server/coordinator/partysearch/MaplePartySearchCoordinator.java
@@ -22,20 +22,6 @@ package net.server.coordinator.partysearch;
 import client.MapleCharacter;
 import client.MapleJob;
 import config.YamlConfig;
-import java.io.File;
-import net.server.world.MapleParty;
-import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
-import tools.MaplePacketCreator;
-import tools.Pair;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import net.server.audit.locks.MonitoredLockType;
 import net.server.audit.locks.MonitoredReadLock;
 import net.server.audit.locks.MonitoredReentrantReadWriteLock;
@@ -43,9 +29,17 @@ import net.server.audit.locks.MonitoredWriteLock;
 import net.server.audit.locks.factory.MonitoredReadLockFactory;
 import net.server.audit.locks.factory.MonitoredWriteLockFactory;
 import net.server.coordinator.world.MapleInviteCoordinator;
+import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
+import net.server.world.MapleParty;
 import provider.MapleData;
 import provider.MapleDataProviderFactory;
 import provider.MapleDataTool;
+import tools.MaplePacketCreator;
+import tools.Pair;
+
+import java.io.File;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  *
@@ -77,7 +71,7 @@ public class MaplePartySearchCoordinator {
         MapleData data = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "Etc.wz")).getData("MapNeighbors.img");
         if (data != null) {
             for (MapleData mapdata : data.getChildren()) {
-                int mapid = Integer.valueOf(mapdata.getName());
+                int mapid = Integer.parseInt(mapdata.getName());
 
                 Set<Integer> neighborMaps = new HashSet<>();
                 mapLinks.put(mapid, neighborMaps);
diff --git a/src/main/java/scripting/AbstractPlayerInteraction.java b/src/main/java/scripting/AbstractPlayerInteraction.java
index 4337892ab0..ef1bcfa13f 100644
--- a/src/main/java/scripting/AbstractPlayerInteraction.java
+++ b/src/main/java/scripting/AbstractPlayerInteraction.java
@@ -425,7 +425,7 @@ public class AbstractPlayerInteraction {
         
         public int getQuestProgressInt(int id) {
                 try {
-                        return Integer.valueOf(getQuestProgress(id));
+                        return Integer.parseInt(getQuestProgress(id));
                 } catch (NumberFormatException nfe) {
                         return 0;
                 }
@@ -433,7 +433,7 @@ public class AbstractPlayerInteraction {
         
         public int getQuestProgressInt(int id, int infoNumber) {
                 try {
-                        return Integer.valueOf(getQuestProgress(id, infoNumber));
+                        return Integer.parseInt(getQuestProgress(id, infoNumber));
                 } catch (NumberFormatException nfe) {
                         return 0;
                 }
diff --git a/src/main/java/server/life/MapleLifeFactory.java b/src/main/java/server/life/MapleLifeFactory.java
index 25691acbeb..45bc6184ac 100644
--- a/src/main/java/server/life/MapleLifeFactory.java
+++ b/src/main/java/server/life/MapleLifeFactory.java
@@ -281,7 +281,7 @@ public class MapleLifeFactory {
 
     private static void decodeElementalString(MapleMonsterStats stats, String elemAttr) {
         for (int i = 0; i < elemAttr.length(); i += 2) {
-            stats.setEffectiveness(Element.getFromChar(elemAttr.charAt(i)), ElementalEffectiveness.getByNumber(Integer.valueOf(String.valueOf(elemAttr.charAt(i + 1)))));
+            stats.setEffectiveness(Element.getFromChar(elemAttr.charAt(i)), ElementalEffectiveness.getByNumber(Integer.parseInt(String.valueOf(elemAttr.charAt(i + 1)))));
         }
     }
 
diff --git a/src/main/java/server/quest/requirements/BuffExceptRequirement.java b/src/main/java/server/quest/requirements/BuffExceptRequirement.java
index 8cefbca776..49b6e52fa3 100644
--- a/src/main/java/server/quest/requirements/BuffExceptRequirement.java
+++ b/src/main/java/server/quest/requirements/BuffExceptRequirement.java
@@ -40,7 +40,7 @@ public class BuffExceptRequirement extends MapleQuestRequirement {
 	@Override
 	public void processData(MapleData data) {
                 // item buffs are negative
-		buffId = -1 * Integer.valueOf(MapleDataTool.getString(data));
+		buffId = -1 * Integer.parseInt(MapleDataTool.getString(data));
 	}
 	
 	@Override
diff --git a/src/main/java/server/quest/requirements/BuffRequirement.java b/src/main/java/server/quest/requirements/BuffRequirement.java
index 65acb054ad..12fb4be21d 100644
--- a/src/main/java/server/quest/requirements/BuffRequirement.java
+++ b/src/main/java/server/quest/requirements/BuffRequirement.java
@@ -40,7 +40,7 @@ public class BuffRequirement extends MapleQuestRequirement {
 	@Override
 	public void processData(MapleData data) {
                 // item buffs are negative
-		buffId = -1 * Integer.valueOf(MapleDataTool.getString(data));
+		buffId = -1 * Integer.parseInt(MapleDataTool.getString(data));
 	}
 	
 	@Override