diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java
index c296e4b2..c320559b 100644
--- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java
@@ -1,5 +1,6 @@
 package WayofTime.bloodmagic.api.livingArmour;
 
+import WayofTime.bloodmagic.api.BloodMagicAPI;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.lang.reflect.Constructor;
@@ -35,7 +36,7 @@ public class LivingArmourHandler
             Constructor<? extends LivingArmourUpgrade> ctor = clazz.getConstructor(int.class);
             if (ctor == null)
             {
-                // TODO: This is bad - add something to the log
+                BloodMagicAPI.getLogger().error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier());
             } else
             {
                 upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor);
diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java
index 68d54f61..059cf1df 100644
--- a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java
+++ b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.function.Consumer;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -165,15 +164,6 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
             return x >= minimumOffset.getX() && x < maximumOffset.getX() && y >= minimumOffset.getY() && y < maximumOffset.getY() && z >= minimumOffset.getZ() && z < maximumOffset.getZ();
         }
 
-        @Override
-        public void forEachRemaining(Consumer<? super BlockPos> action)
-        {
-            while (hasNext())
-            {
-                action.accept(next());
-            }
-        }
-
         @Override
         public boolean hasNext()
         {
@@ -387,79 +377,63 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
             return blockPosCache.contains(pos);
         }
 
-        @Override
-        public void forEachRemaining(Consumer<? super BlockPos> arg0)
-        {
-            // TODO Auto-generated method stub
-
-        }
-
         @Override
         public boolean hasNext()
         {
-            // TODO Auto-generated method stub
             return false;
         }
 
         @Override
         public BlockPos next()
         {
-            // TODO Auto-generated method stub
             return null;
         }
 
         @Override
         public void remove()
         {
-            // TODO Auto-generated method stub
 
         }
 
         @Override
         public void resetIterator()
         {
-            // TODO Auto-generated method stub
 
         }
 
         @Override
         public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2)
         {
-            // TODO Auto-generated method stub
+
         }
 
         @Override
         public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2)
         {
-            // TODO Auto-generated method stub
             return 0;
         }
 
         @Override
         public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit)
         {
-            // TODO Auto-generated method stub
             return false;
         }
 
         @Override
         public int getVolume()
         {
-            // TODO Auto-generated method stub
             return 0;
         }
 
         @Override
         public boolean isWithinRange(int verticalLimit, int horizontalLimit)
         {
-            // TODO Auto-generated method stub
             return false;
         }
 
         @Override
         public boolean intersects(AreaDescriptor descriptor)
         {
-            // TODO Auto-generated method stub
             return false;
         }
 
@@ -472,7 +446,6 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
         @Override
         public AreaDescriptor rotateDescriptor(PlacementSettings settings)
         {
-            // TODO Auto-generated method stub
             return this;
         }
     }
@@ -541,80 +514,63 @@ public abstract class AreaDescriptor implements Iterator<BlockPos>
             return null;
         }
 
-        @Override
-        public void forEachRemaining(Consumer<? super BlockPos> arg0)
-        {
-            // TODO Auto-generated method stub
-
-        }
-
         @Override
         public void remove()
         {
-            // TODO Auto-generated method stub
 
         }
 
         @Override
         public void resetIterator()
         {
-            // TODO Auto-generated method stub
 
         }
 
         @Override
         public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2)
         {
-            // TODO Auto-generated method stub
 
         }
 
         @Override
         public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2)
         {
-            // TODO Auto-generated method stub
             return 0;
         }
 
         @Override
         public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit)
         {
-            // TODO Auto-generated method stub
             return false;
         }
 
         @Override
         public int getVolume()
         {
-            // TODO Auto-generated method stub
             return 0;
         }
 
         @Override
         public boolean isWithinRange(int verticalLimit, int horizontalLimit)
         {
-            // TODO Auto-generated method stub
             return false;
         }
 
         @Override
         public boolean intersects(AreaDescriptor descriptor)
         {
-            // TODO Auto-generated method stub
             return false;
         }
 
         @Override
         public AreaDescriptor offset(BlockPos offset)
         {
-            // TODO Auto-generated method stub
             return new AreaDescriptor.Cross(centerPos.add(offset), size);
         }
 
         @Override
         public AreaDescriptor rotateDescriptor(PlacementSettings settings)
         {
-            // TODO Auto-generated method stub
             return this;
         }
     }