diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSource.java
index 8f76b84992c..dcd7b067b6f 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/CopyPasteImageSource.java
@@ -149,15 +149,13 @@ public enum CopyPasteImageSource implements CardImageSource {
             viewMissingCards = false;
             String displayMissingCardsStr = "Up to the first 20 cards are:\n";
             String missingCardsStr = "";
-            if (this.missingCards != null) {
-                for (String card : this.missingCards) {
-                    if (count < 20) {
-                        displayMissingCardsStr = displayMissingCardsStr + card + "\n";
-                    }
-                    missingCardsStr = missingCardsStr + card + "\n";
-
-                    count++;
+            for (String card : this.missingCards) {
+                if (count < 20) {
+                    displayMissingCardsStr = displayMissingCardsStr + card + "\n";
                 }
+                missingCardsStr = missingCardsStr + card + "\n";
+
+                count++;
             }
             StringSelection stringSelection = new StringSelection(missingCardsStr);
             Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java
index 9efa9805724..2efaf6d0a28 100644
--- a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java
+++ b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java
@@ -102,7 +102,7 @@ class ArchonOfValorsReachReplacementEffect extends ContinuousRuleModifyingEffect
 
         if (savedType instanceof String && card != null) {
             CardType cardType = CardType.fromString((String) savedType);
-            if (cardType != null && card != null && card.getCardType().contains(cardType)) {
+            if (cardType != null && card.getCardType().contains(cardType)) {
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/c/CadaverousBloom.java b/Mage.Sets/src/mage/cards/c/CadaverousBloom.java
index 894a39f6fcd..251a217076c 100644
--- a/Mage.Sets/src/mage/cards/c/CadaverousBloom.java
+++ b/Mage.Sets/src/mage/cards/c/CadaverousBloom.java
@@ -79,9 +79,7 @@ class CadaverousBloomManaEffect extends BasicManaEffect {
                             getManaTemplate().getColorless() * count
                     );
                         
-                    if (count > 0) {
-                        netMana.add(mana);
-                    }
+                    netMana.add(mana);
                 }
             }
             return netMana;
diff --git a/Mage.Sets/src/mage/cards/g/GnostroVoiceOfTheCrags.java b/Mage.Sets/src/mage/cards/g/GnostroVoiceOfTheCrags.java
index b57d5c67d65..b5563f15acf 100644
--- a/Mage.Sets/src/mage/cards/g/GnostroVoiceOfTheCrags.java
+++ b/Mage.Sets/src/mage/cards/g/GnostroVoiceOfTheCrags.java
@@ -104,7 +104,7 @@ class GnostroVoiceOfTheCragsEffect extends OneShotEffect {
         if (player == null) {
             return false;
         }
-        return player != null && player.scry(
+        return player.scry (
                 GnostroVoiceOfTheCragsValue.instance.calculate(game, source, this), source, game
         );
     }
diff --git a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java
index ac972f5a181..b3f63dbb3a7 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java
@@ -105,7 +105,7 @@ class OathOfLimDulEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Boolean sacrificeDone = false;
+        boolean sacrificeDone = false;
         int numberSacrificed = 0;
         int numberToDiscard = 0;
         int numberOfControlledPermanents = 0;
diff --git a/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java
index c6b9600d17c..c6fd9a996fc 100644
--- a/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java
+++ b/Mage/src/main/java/mage/cards/decks/importer/PlainTextDeckImporter.java
@@ -40,7 +40,7 @@ public abstract class PlainTextDeckImporter extends DeckImporter {
         sbMessage.setLength(0);
         try {
             try (Scanner scanner = new Scanner(f)) {
-                Boolean canFix = true;
+                boolean canFix = true;
                 while (scanner.hasNextLine()) {
                     String line = scanner.nextLine().trim();
                     FixedInfo fixedInfo = new FixedInfo(line);