diff --git a/src/main/java/forge/card/CardColor.java b/src/main/java/forge/card/CardColor.java
index f48c551c843..67f2e1dec46 100644
--- a/src/main/java/forge/card/CardColor.java
+++ b/src/main/java/forge/card/CardColor.java
@@ -1,9 +1,5 @@
 package forge.card;
 
-import org.apache.tools.ant.taskdefs.Concat;
-
-import forge.Constant;
-
 /**
  * <p>CardColor class.</p>
  *
diff --git a/src/main/java/forge/card/CardDb.java b/src/main/java/forge/card/CardDb.java
index e9a3a01725c..e56236dda86 100644
--- a/src/main/java/forge/card/CardDb.java
+++ b/src/main/java/forge/card/CardDb.java
@@ -2,11 +2,9 @@ package forge.card;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Properties;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/forge/card/CardManaCost.java b/src/main/java/forge/card/CardManaCost.java
index 9ac79b909b5..6ccd1d527fd 100644
--- a/src/main/java/forge/card/CardManaCost.java
+++ b/src/main/java/forge/card/CardManaCost.java
@@ -1,10 +1,9 @@
 package forge.card;
 
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map.Entry;
+
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/src/main/java/forge/card/CardManaCostShard.java b/src/main/java/forge/card/CardManaCostShard.java
index 9ba09cdacd5..8e1320566b8 100644
--- a/src/main/java/forge/card/CardManaCostShard.java
+++ b/src/main/java/forge/card/CardManaCostShard.java
@@ -1,7 +1,5 @@
 package forge.card;
 
-import forge.card.mana.ManaCost;
-
 public class CardManaCostShard {
 
     private final int shard;
diff --git a/src/main/java/forge/card/CardPrinted.java b/src/main/java/forge/card/CardPrinted.java
index dab82243c77..1f699b9b2c1 100644
--- a/src/main/java/forge/card/CardPrinted.java
+++ b/src/main/java/forge/card/CardPrinted.java
@@ -2,9 +2,6 @@ package forge.card;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-
 import net.slightlymagic.braids.util.lambda.Lambda1;
 import net.slightlymagic.maxmtg.Predicate;
 import forge.AllZone;
diff --git a/src/main/java/forge/card/CardRarity.java b/src/main/java/forge/card/CardRarity.java
index d22af703acc..80abc38c98d 100644
--- a/src/main/java/forge/card/CardRarity.java
+++ b/src/main/java/forge/card/CardRarity.java
@@ -8,17 +8,15 @@ package forge.card;
  */
 
 public enum CardRarity {
-    BasicLand(0, "L"),
-    Common(1, "C"),
-    Uncommon(2, "U"),
-    Rare(3, "R"),
-    MythicRare(4, "M"),
-    Special(10, "S"); // Timeshifted
+    BasicLand("L"),
+    Common("C"),
+    Uncommon("U"),
+    Rare("R"),
+    MythicRare("M"),
+    Special("S"); // Timeshifted
 
-    private final int rating;
     private final String strValue;
-    private CardRarity(final int value, final String sValue) {
-        rating = value;
+    private CardRarity(final String sValue) {
         strValue = sValue;
     }
 
diff --git a/src/main/java/forge/card/CardRules.java b/src/main/java/forge/card/CardRules.java
index adb48b0ed0e..7000771005c 100644
--- a/src/main/java/forge/card/CardRules.java
+++ b/src/main/java/forge/card/CardRules.java
@@ -308,7 +308,7 @@ public final class CardRules {
 
             @Override
             public boolean isTrue(final CardRules card) {
-                return card.getRarityFromLatestSet().equals(operand);
+                return card.getRarityFromLatestSet().equals(operand) == shouldBeEqual;
             }
 
             public PredicateLastesSetRarity(final CardRarity type, final boolean wantEqual) {
diff --git a/src/main/java/forge/card/MtgDataParser.java b/src/main/java/forge/card/MtgDataParser.java
index 8ad17798706..b18b5eb631f 100644
--- a/src/main/java/forge/card/MtgDataParser.java
+++ b/src/main/java/forge/card/MtgDataParser.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.naming.OperationNotSupportedException;
-
 import org.apache.commons.lang3.StringUtils;
 
 public final class MtgDataParser implements Iterator<CardRules> {