diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 14f222c85fb..c0c4ce4c11a 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -236,11 +236,6 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.1</version>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
diff --git a/forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java b/forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java
index 624623967bf..bfd8d904d2d 100644
--- a/forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java
+++ b/forge-gui/src/main/java/forge/card/ability/ai/BalanceAi.java
@@ -2,8 +2,6 @@ package forge.card.ability.ai;
 
 import java.util.List;
 
-import org.apache.commons.lang.math.RandomUtils;
-
 import forge.Card;
 import forge.CardLists;
 import forge.CardPredicates;
@@ -11,6 +9,7 @@ import forge.card.ability.SpellAbilityAi;
 import forge.card.spellability.SpellAbility;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
+import forge.util.MyRandom;
 
 public class BalanceAi extends SpellAbilityAi {
 
@@ -48,6 +47,6 @@ public class BalanceAi extends SpellAbilityAi {
         diff += 0.5 * (humHand.size() - compHand.size());
 
         // Larger differential == more chance to actually cast this spell
-        return diff > 2 && RandomUtils.nextInt(100) < diff*10;
+        return diff > 2 && MyRandom.getRandom().nextInt(100) < diff*10;
     }
 }
diff --git a/forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java b/forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java
index 384b470a9aa..97114643707 100644
--- a/forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java
+++ b/forge-gui/src/main/java/forge/card/ability/effects/ChooseNumberEffect.java
@@ -3,7 +3,7 @@ package forge.card.ability.effects;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import forge.Card;
 import forge.card.ability.SpellAbilityEffect;
diff --git a/forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java b/forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java
index 8ce2dd1ece6..bcde099a00d 100644
--- a/forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java
+++ b/forge-gui/src/main/java/forge/card/ability/effects/DiscardEffect.java
@@ -3,7 +3,7 @@ package forge.card.ability.effects;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Lists;
 
diff --git a/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index 8ecadbd6cab..7d8a6e66d92 100644
--- a/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -20,7 +20,7 @@ package forge.card.cardfactory;
 import java.util.*;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
diff --git a/forge-gui/src/main/java/forge/card/cardfactory/CardStorageReader.java b/forge-gui/src/main/java/forge/card/cardfactory/CardStorageReader.java
index 093b430969e..d4f2f1667a3 100644
--- a/forge-gui/src/main/java/forge/card/cardfactory/CardStorageReader.java
+++ b/forge-gui/src/main/java/forge/card/cardfactory/CardStorageReader.java
@@ -35,7 +35,7 @@ import java.util.concurrent.Future;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 
 import forge.FThreads;
 import forge.ICardStorageReader;
diff --git a/forge-gui/src/main/java/forge/card/cost/CostAddMana.java b/forge-gui/src/main/java/forge/card/cost/CostAddMana.java
index 3f9ca0179ef..946eea24a2e 100644
--- a/forge-gui/src/main/java/forge/card/cost/CostAddMana.java
+++ b/forge-gui/src/main/java/forge/card/cost/CostAddMana.java
@@ -18,7 +18,7 @@
 package forge.card.cost;
 
 import java.util.ArrayList;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import forge.Card;
 import forge.card.ColorSet;
diff --git a/forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java b/forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java
index 05813461540..8ab325b38f2 100644
--- a/forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java
+++ b/forge-gui/src/main/java/forge/card/spellability/TargetRestrictions.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import forge.Card;
 import forge.GameObject;
diff --git a/forge-gui/src/main/java/forge/control/FControl.java b/forge-gui/src/main/java/forge/control/FControl.java
index 71b5422f5f0..20b87dcd4b4 100644
--- a/forge-gui/src/main/java/forge/control/FControl.java
+++ b/forge-gui/src/main/java/forge/control/FControl.java
@@ -35,7 +35,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import forge.Card;
 import forge.Constant.Preferences;
diff --git a/forge-gui/src/main/java/forge/deck/CardCollections.java b/forge-gui/src/main/java/forge/deck/CardCollections.java
index f82ed97ffe8..487d0c9e2b8 100644
--- a/forge-gui/src/main/java/forge/deck/CardCollections.java
+++ b/forge-gui/src/main/java/forge/deck/CardCollections.java
@@ -19,7 +19,7 @@ package forge.deck;
 
 import java.io.File;
 
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 
 import forge.deck.io.DeckGroupSerializer;
 import forge.deck.io.DeckSerializer;
diff --git a/forge-gui/src/main/java/forge/game/GameActionUtil.java b/forge-gui/src/main/java/forge/game/GameActionUtil.java
index a71b9a8a843..41bef8c9e25 100644
--- a/forge-gui/src/main/java/forge/game/GameActionUtil.java
+++ b/forge-gui/src/main/java/forge/game/GameActionUtil.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
diff --git a/forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java b/forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java
index 4fed5766d8a..8ce87693012 100644
--- a/forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java
+++ b/forge-gui/src/main/java/forge/game/ai/AiProfileUtil.java
@@ -28,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.ArrayList;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * Holds default AI personality profile values in an enum.
diff --git a/forge-gui/src/main/java/forge/game/ai/ComputerUtil.java b/forge-gui/src/main/java/forge/game/ai/ComputerUtil.java
index 3fa4f6d5238..3d9e46875a3 100644
--- a/forge-gui/src/main/java/forge/game/ai/ComputerUtil.java
+++ b/forge-gui/src/main/java/forge/game/ai/ComputerUtil.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
diff --git a/forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java b/forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java
index e4189302674..633c0546bf8 100644
--- a/forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java
+++ b/forge-gui/src/main/java/forge/game/ai/ComputerUtilMana.java
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.base.Predicate;
 import forge.Card;
diff --git a/forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java b/forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java
index 869f6cc95bf..c26baed4c3b 100644
--- a/forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java
+++ b/forge-gui/src/main/java/forge/game/event/GameEventCardStatsChanged.java
@@ -2,7 +2,7 @@ package forge.game.event;
 
 import java.util.Arrays;
 import java.util.Collection;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Iterables;
 
diff --git a/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java
index 56595559c15..0ada6ca26bf 100644
--- a/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java
+++ b/forge-gui/src/main/java/forge/game/limited/BoosterDraft.java
@@ -29,7 +29,7 @@ import java.util.TreeMap;
 
 import javax.swing.JOptionPane;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 import com.google.common.base.Supplier;
 import forge.Card;
diff --git a/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java
index d68e08b68b5..3bad504182e 100644
--- a/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java
+++ b/forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java
@@ -24,7 +24,7 @@ import java.util.Stack;
 
 import javax.swing.JOptionPane;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 import forge.Singletons;
 import forge.card.CardBlock;
diff --git a/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java b/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java
index 6359ac0b489..9b43aace635 100644
--- a/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-gui/src/main/java/forge/game/phase/PhaseHandler.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
diff --git a/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java b/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
index ff18e885dce..0f15cba076a 100644
--- a/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
+++ b/forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
@@ -1,7 +1,5 @@
 package forge.game.player;
 
-import org.apache.commons.lang.NotImplementedException;
-
 import forge.game.Game;
 import forge.net.client.INetClient;
 import forge.net.protocol.toclient.ChatPacketClt;
@@ -26,7 +24,7 @@ public class LobbyPlayerRemote extends LobbyPlayer {
     @Override
     public Player getPlayer(Game gameState) {
         // Cannot create remote players yet 
-        throw new NotImplementedException();
+        throw new UnsupportedOperationException("method is not implemented");
     }
 
     @Override
@@ -40,6 +38,6 @@ public class LobbyPlayerRemote extends LobbyPlayer {
     @Override
     public PlayerController createControllerFor(Player p) {
         // Cannot create remote players yet 
-        throw new NotImplementedException();
+        throw new UnsupportedOperationException("method is not implemented");
     }
 }
\ No newline at end of file
diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
index 507b3ed3177..8f16ad9916d 100644
--- a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
+++ b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
@@ -16,7 +16,7 @@ import javax.swing.ScrollPaneConstants;
 
 import net.miginfocom.swing.MigLayout;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 
 import forge.Command;
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java b/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
index 87dfd2ce4f8..66755f3a02b 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
@@ -43,8 +43,8 @@ import javax.swing.Timer;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import org.apache.commons.lang.CharUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.CharUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.primitives.Ints;
 
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java b/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java
index 3ba0e80e8b3..58314ef2b71 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java
@@ -2,7 +2,7 @@ package forge.gui.deckeditor;
 
 import javax.swing.JOptionPane;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import forge.Singletons;
 import forge.deck.DeckBase;
diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java
index 5d1dac1e72c..74407ac639d 100644
--- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java
+++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java
@@ -9,7 +9,7 @@ import javax.swing.JCheckBox;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
 import forge.Command;
diff --git a/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java b/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java
index 7dfce65dcee..bd79aba0f82 100644
--- a/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java
+++ b/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java
@@ -2,7 +2,7 @@ package forge.gui.home.settings;
 
 import javax.swing.JOptionPane;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import forge.Singletons;
 import forge.properties.ForgePreferences;
diff --git a/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java b/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java
index d7ed637f097..992328f3391 100644
--- a/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java
+++ b/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java
@@ -28,7 +28,7 @@ import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import forge.Card;
 import forge.Singletons;
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
index 692588c1d12..b30318b2ff0 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
@@ -53,7 +53,7 @@ import javax.swing.border.Border;
 import javax.swing.border.LineBorder;
 import javax.swing.text.JTextComponent;
 
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.lang3.text.WordUtils;
 
 import forge.FThreads;
 import forge.Singletons;
diff --git a/forge-gui/src/main/java/forge/net/FServer.java b/forge-gui/src/main/java/forge/net/FServer.java
index 4be64013417..f546a4248f3 100644
--- a/forge-gui/src/main/java/forge/net/FServer.java
+++ b/forge-gui/src/main/java/forge/net/FServer.java
@@ -6,7 +6,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 
 import forge.GameLogEntry;
 import forge.Singletons;
diff --git a/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java b/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java
index 9ac8db50325..7491d6c71e2 100644
--- a/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java
+++ b/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
 import forge.util.FileSection;
diff --git a/forge-gui/src/main/java/forge/util/storage/StorageNestedFolders.java b/forge-gui/src/main/java/forge/util/storage/StorageNestedFolders.java
index 4f622a23257..2a6c33f74a2 100644
--- a/forge-gui/src/main/java/forge/util/storage/StorageNestedFolders.java
+++ b/forge-gui/src/main/java/forge/util/storage/StorageNestedFolders.java
@@ -3,8 +3,6 @@ package forge.util.storage;
 import java.io.File;
 import java.util.HashMap;
 
-import org.apache.commons.lang.NotImplementedException;
-
 import com.google.common.base.Function;
 
 
@@ -30,7 +28,7 @@ public class StorageNestedFolders<T> extends StorageBase<IStorage<T>> {
         subdir.mkdir();
         
         // TODO: save recursivelly the passed IStorage 
-        throw new NotImplementedException();
+        throw new UnsupportedOperationException("method is not implemented");
     }
     
     @Override