diff --git a/patches/minecraft/net/minecraft/item/crafting/IRecipe.java.patch b/patches/minecraft/net/minecraft/item/crafting/IRecipe.java.patch
index 635aad3edb..03fca2aa69 100644
--- a/patches/minecraft/net/minecraft/item/crafting/IRecipe.java.patch
+++ b/patches/minecraft/net/minecraft/item/crafting/IRecipe.java.patch
@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/item/crafting/IRecipe.java
 +++ ../src-work/minecraft/net/minecraft/item/crafting/IRecipe.java
-@@ -4,35 +4,30 @@
+@@ -4,35 +4,33 @@
  import net.minecraft.item.ItemStack;
  import net.minecraft.util.NonNullList;
  import net.minecraft.world.World;
@@ -19,7 +19,11 @@
  
      ItemStack func_77571_b();
  
-     NonNullList<ItemStack> func_179532_b(InventoryCrafting p_179532_1_);
+-    NonNullList<ItemStack> func_179532_b(InventoryCrafting p_179532_1_);
++    default NonNullList<ItemStack> func_179532_b(InventoryCrafting p_179532_1_)
++    {
++        return net.minecraftforge.common.ForgeHooks.defaultRecipeGetRemainingItems(p_179532_1_);
++    }
  
 -    @SideOnly(Side.CLIENT)
 -default NonNullList<Ingredient> func_192400_c()
diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index ef5bc0593e..9f011b5507 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -929,8 +929,6 @@ public class ForgeHooks
      * Default implementation of IRecipe.func_179532_b {getRemainingItems} because
      * this is just copy pasted over a lot of recipes.
      *
-     * Another use case for java 8 but sadly we can't use it!
-     *
      * @param inv Crafting inventory
      * @return Crafting inventory contents after the recipe.
      */
diff --git a/src/main/java/net/minecraftforge/common/ForgeModContainer.java b/src/main/java/net/minecraftforge/common/ForgeModContainer.java
index 5182d66d02..ae2721ee9a 100644
--- a/src/main/java/net/minecraftforge/common/ForgeModContainer.java
+++ b/src/main/java/net/minecraftforge/common/ForgeModContainer.java
@@ -199,6 +199,7 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC
         if (config.getCategory(CATEGORY_GENERAL).containsKey("defaultSpawnFuzz")) config.getCategory(CATEGORY_GENERAL).remove("defaultSpawnFuzz");
         if (config.getCategory(CATEGORY_GENERAL).containsKey("spawnHasFuzz")) config.getCategory(CATEGORY_GENERAL).remove("spawnHasFuzz");
         if (config.getCategory(CATEGORY_GENERAL).containsKey("disableStitchedFileSaving")) config.getCategory(CATEGORY_GENERAL).remove("disableStitchedFileSaving");
+        if (config.getCategory(CATEGORY_CLIENT).containsKey("java8Reminder")) config.getCategory(CATEGORY_CLIENT).remove("java8Reminder");
 
         prop = config.get(CATEGORY_GENERAL, "disableVersionCheck", false);
         prop.setComment("Set to true to disable Forge's version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.");
diff --git a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java
index 5834f759db..805fd18f81 100644
--- a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java
+++ b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java
@@ -154,13 +154,6 @@ public class ShapedOreRecipe extends IForgeRegistryEntry.Impl<IRecipe> implement
         return this.input;
     }
 
-    @Override
-    @Nonnull
-    public NonNullList<ItemStack> getRemainingItems(@Nonnull InventoryCrafting inv) //getRecipeLeftovers
-    {
-        return ForgeHooks.defaultRecipeGetRemainingItems(inv);
-    }
-
     public int getWidth()
     {
         return width;
diff --git a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java
index 66da171aec..42c554a9d0 100644
--- a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java
+++ b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java
@@ -131,13 +131,6 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl<IRecipe> implem
         return this.input;
     }
 
-    @Override
-    @Nonnull
-    public NonNullList<ItemStack> getRemainingItems(@Nonnull InventoryCrafting inv)
-    {
-        return ForgeHooks.defaultRecipeGetRemainingItems(inv);
-    }
-
     @Override
     @Nonnull
     public String getGroup()
diff --git a/src/test/java/net/minecraftforge/fml/debug/Java8Debug.java b/src/test/java/net/minecraftforge/fml/debug/Java8Debug.java
deleted file mode 100644
index a7dffa2264..0000000000
--- a/src/test/java/net/minecraftforge/fml/debug/Java8Debug.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*package net.minecraftforge.fml.debug;
-
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-
-@Mod(modid = Java8Debug.MODID, version = Java8Debug.VERSION)
-public class Java8Debug implements ITest
-{
-    public static final String MODID = "Java8Debug";
-    public static final String VERSION = "1.0";
-
-    @EventHandler
-    public void init(FMLInitializationEvent event)
-    {
-        System.out.println("Java8Debug mod loaded");
-    }
-}
-
-interface ITest
-{
-    default int test()
-    {
-        return 42;
-    }
-}*/