diff --git a/.gitattributes b/.gitattributes
index df365a29ce0..d6bbfe1e43a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10643,7 +10643,6 @@ src/main/java/forge/ComputerUtilAttack.java svneol=native#text/plain
 src/main/java/forge/ComputerUtilBlock.java svneol=native#text/plain
 src/main/java/forge/Constant.java svneol=native#text/plain
 src/main/java/forge/ConstantStringArrayList.java svneol=native#text/plain
-src/main/java/forge/ConstantStringHashMap.java svneol=native#text/plain
 src/main/java/forge/CopyFiles.java svneol=native#text/plain
 src/main/java/forge/Counters.java svneol=native#text/plain
 src/main/java/forge/DefaultPlayerZone.java svneol=native#text/plain
diff --git a/src/main/java/forge/Constant.java b/src/main/java/forge/Constant.java
index dad57e5b2b1..fbfb2e4e13e 100644
--- a/src/main/java/forge/Constant.java
+++ b/src/main/java/forge/Constant.java
@@ -109,33 +109,6 @@ public final class Constant {
         }
     }
 
-    // public interface IO {
-    // probably should read this from a file, or set from GUI
-
-    // public static final String deckFile = "all-decks2";
-    // public static final String boosterDeckFile = "booster-decks";
-
-    // public static final String imageBaseDir = "pics";
-
-    // public static final ImageIcon upIcon = new ImageIcon("up.gif");
-    // public static final ImageIcon downIcon = new ImageIcon("down.gif");
-    // public static final ImageIcon leftIcon = new ImageIcon("left.gif");
-    // public static final ImageIcon rightIcon = new ImageIcon("right.gif");
-    // }
-
-    /**
-     * The Interface Ability.
-     */
-    /*
-     * public interface Ability {
-     *//** The Triggered. */
-    /*
-     * String TRIGGERED = "Triggered";
-     *//** The Activated. */
-    /*
-     * String ACTIVATED = "Activated"; }
-     */
-
     /**
      * The Interface Phase.
      */
@@ -294,8 +267,6 @@ public final class Constant {
 
         /** The loaded. */
         public static final boolean[] LOADED = { false };
-        // public static final Constant_StringHashMap[] LandColor = new
-        // Constant_StringHashMap[1];
 
         /** The Basic lands. */
         public static final String[] BASIC_LANDS = { "Plains", "Island", "Swamp", "Mountain", "Forest" };
diff --git a/src/main/java/forge/ConstantStringHashMap.java b/src/main/java/forge/ConstantStringHashMap.java
deleted file mode 100644
index e92c28cb284..00000000000
--- a/src/main/java/forge/ConstantStringHashMap.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*package forge;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The Class Constant_StringHashMap.
- *
-public class ConstantStringHashMap {
-
-    /** The map. *
-    private Map<String, String> map = new HashMap<String, String>();
-
-}
- */