diff --git a/src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java b/src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java
index 5cb3f3f307..ea9bb59520 100644
--- a/src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java
+++ b/src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java
@@ -38,6 +38,6 @@ public class FMLForgePlugin implements IFMLLoadingPlugin
     @Override
     public String getAccessTransformerClass()
     {
-        return "net.minecraftforge.transformers.ForgeAccessTransformer";
+        return null;
     }
 }
diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java
index fcc02fe123..bc5db2f84e 100644
--- a/src/main/java/net/minecraftforge/common/ForgeVersion.java
+++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java
@@ -26,7 +26,10 @@ public class ForgeVersion
     public static final int revisionVersion = 3;
     //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
     public static final int buildVersion    = 0;
-
+    // This is the minecraft version we're building for - used in various places in Forge/FML code
+    public static final String mcVersion = "1.8";
+    // This is the MCP data version we're using
+    public static final String mcpVersion = "9.10";
     private static Status status = PENDING;
     private static String target = null;
 
diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java
index 50c8c5769b..6b60ace8e7 100644
--- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java
+++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java
@@ -93,7 +93,7 @@ public class AccessTransformer implements IClassTransformer
 
     public AccessTransformer() throws IOException
     {
-        this("fml_at.cfg");
+        this("forge_at.cfg");
     }
     protected AccessTransformer(String rulesFile) throws IOException
     {
diff --git a/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java b/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java
index e86b1eda81..b8ca93121d 100644
--- a/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java
+++ b/src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java
@@ -21,7 +21,6 @@ public class FMLCorePlugin implements IFMLLoadingPlugin
     {
         return new String[] {
                              "net.minecraftforge.fml.common.asm.transformers.BlamingTransformer",
-                             "net.minecraftforge.fml.common.asm.transformers.MarkerTransformer",
                              "net.minecraftforge.fml.common.asm.transformers.SideTransformer",
                              "net.minecraftforge.fml.common.asm.transformers.EventSubscriptionTransformer",
                              "net.minecraftforge.fml.common.asm.transformers.EventSubscriberTransformer",
diff --git a/src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java b/src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java
index 5c46260868..6a9cf9b72a 100644
--- a/src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java
+++ b/src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java
@@ -13,14 +13,11 @@
 package net.minecraftforge.fml.relauncher;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
-import org.apache.logging.log4j.Level;
 
 import net.minecraft.launchwrapper.LaunchClassLoader;
+import net.minecraftforge.common.ForgeVersion;
 
 public class FMLInjectionData
 {
@@ -31,35 +28,18 @@ public class FMLInjectionData
     static String build;
     static String mccversion;
     static String mcpversion;
-    static String deobfuscationDataHash;
 
     public static List<String> containers = new ArrayList<String>();
 
     static void build(File mcHome, LaunchClassLoader classLoader)
     {
         minecraftHome = mcHome;
-        InputStream stream = classLoader.getResourceAsStream("fmlversion.properties");
-        Properties properties = new Properties();
-
-        if (stream != null)
-        {
-            try
-            {
-                properties.load(stream);
-            }
-            catch (IOException ex)
-            {
-                FMLRelaunchLog.log(Level.ERROR, ex, "Could not get FML version information - corrupted installation detected!");
-            }
-        }
-
-        major = properties.getProperty("fmlbuild.major.number", "missing");
-        minor = properties.getProperty("fmlbuild.minor.number", "missing");
-        rev = properties.getProperty("fmlbuild.revision.number", "missing");
-        build = properties.getProperty("fmlbuild.build.number", "missing");
-        mccversion = properties.getProperty("fmlbuild.mcversion", "missing");
-        mcpversion = properties.getProperty("fmlbuild.mcpversion", "missing");
-        deobfuscationDataHash = properties.getProperty("fmlbuild.deobfuscation.hash","deadbeef");
+        major = String.valueOf(ForgeVersion.majorVersion);
+        minor = String.valueOf(ForgeVersion.minorVersion);
+        rev = String.valueOf(ForgeVersion.revisionVersion);
+        build = String.valueOf(ForgeVersion.buildVersion);
+        mccversion = ForgeVersion.mcVersion;
+        mcpversion = ForgeVersion.mcpVersion;
     }
 
     static String debfuscationDataName()
diff --git a/src/main/java/net/minecraftforge/transformers/ForgeAccessTransformer.java b/src/main/java/net/minecraftforge/transformers/ForgeAccessTransformer.java
deleted file mode 100644
index 57610e9d4c..0000000000
--- a/src/main/java/net/minecraftforge/transformers/ForgeAccessTransformer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.minecraftforge.transformers;
-
-import java.io.IOException;
-
-import net.minecraftforge.fml.common.asm.transformers.AccessTransformer;
-
-public class ForgeAccessTransformer extends AccessTransformer
-{
-    public ForgeAccessTransformer() throws IOException
-    {
-        super("forge_at.cfg");
-    }
-}
diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties
deleted file mode 100644
index a9ebc93896..0000000000
--- a/src/main/resources/fmlversion.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-fmlbuild.major.number=8
-fmlbuild.minor.number=0
-fmlbuild.revision.number=76
-fmlbuild.build.number=1404
-fmlbuild.mcversion=1.8
-fmlbuild.mcpversion=9.10