diff --git a/src/main/java/appeng/helpers/NonNullArrayIterator.java b/src/main/java/appeng/helpers/NonNullArrayIterator.java
index ca952628a..7c964168b 100644
--- a/src/main/java/appeng/helpers/NonNullArrayIterator.java
+++ b/src/main/java/appeng/helpers/NonNullArrayIterator.java
@@ -21,8 +21,6 @@ package appeng.helpers;
 
 import java.util.Iterator;
 
-import scala.NotImplementedError;
-
 
 public class NonNullArrayIterator<E> implements Iterator<E>
 {
@@ -58,6 +56,6 @@ public class NonNullArrayIterator<E> implements Iterator<E>
 	@Override
 	public void remove()
 	{
-		throw new NotImplementedError();
+		throw new UnsupportedOperationException();
 	}
 }
diff --git a/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java
index d145b7ca8..15f2fa2ff 100644
--- a/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java
+++ b/src/main/java/appeng/integration/modules/jei/ShapedRecipeWrapper.java
@@ -20,6 +20,7 @@ package appeng.integration.modules.jei;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -28,7 +29,6 @@ import net.minecraft.item.ItemStack;
 import mezz.jei.api.ingredients.IIngredients;
 import mezz.jei.api.recipe.BlankRecipeWrapper;
 import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper;
-import scala.actors.threadpool.Arrays;
 
 import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RegistrationError;