diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitGroup.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitGroup.java
index 1217f2f2..bd5e176a 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitGroup.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitGroup.java
@@ -12,7 +12,6 @@ public enum TraitGroup {
         this.corruption = corruption;
     }
 
-    // TODO: implement corruption mechanics
     public float getCorruption() {
         return corruption;
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/state/StatePredicate.java b/src/main/java/com/minelittlepony/unicopia/block/state/StatePredicate.java
index 7614746c..5a6ded9f 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/state/StatePredicate.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/state/StatePredicate.java
@@ -12,6 +12,7 @@ import com.google.common.base.Predicates;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
+import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags;
 import net.minecraft.block.*;
 import net.minecraft.state.property.Property;
 import net.minecraft.util.Identifier;
@@ -118,8 +119,7 @@ public abstract class StatePredicate implements Predicate<BlockState> {
     }
 
     static boolean isOre(BlockState s) {
-        // TODO: Use ConventionalBlockTags.ORES
-        return s.getBlock() instanceof ExperienceDroppingBlock && !(s.getBlock() instanceof SculkBlock);
+        return s.isIn(ConventionalBlockTags.ORES);
     }
 
     static boolean isWater(BlockState s) {
diff --git a/src/main/java/com/minelittlepony/unicopia/client/particle/DiskParticle.java b/src/main/java/com/minelittlepony/unicopia/client/particle/DiskParticle.java
index 77ea8ba7..0d75c3d1 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/particle/DiskParticle.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/DiskParticle.java
@@ -16,7 +16,6 @@ public class DiskParticle extends SphereParticle {
     public DiskParticle(SphereParticleEffect effect, ClientWorld w, double x, double y, double z, double rX, double rY, double rZ) {
         super(effect, w, x, y, z, 0, 0, 0);
 
-        // TODO: was hamiltonianProduct (check this!!!)
         rotation.mul(RotationAxis.POSITIVE_Y.rotationDegrees((float)effect.getOffset().y));
         rotation.mul(RotationAxis.POSITIVE_X.rotationDegrees(90 - (float)effect.getOffset().x));
 
diff --git a/src/main/java/com/minelittlepony/unicopia/client/particle/RunesParticle.java b/src/main/java/com/minelittlepony/unicopia/client/particle/RunesParticle.java
index eefe4950..aa785aa6 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/particle/RunesParticle.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/RunesParticle.java
@@ -90,11 +90,9 @@ public class RunesParticle extends OrientedBillboardParticle implements Attachme
         }
         if (key == ATTR_PITCH) {
             rotation = new Quaternionf(0, 0, 0, 1);
-            // TODO: Was hamiltonianProduct (CHECK!!!)
             rotation.mul(RotationAxis.POSITIVE_Y.rotationDegrees(value.floatValue()));
         }
         if (key == ATTR_YAW) {
-            // TODO: Was hamiltonianProduct (CHECK!!!)
             rotation.mul(RotationAxis.POSITIVE_X.rotationDegrees(180 - value.floatValue()));
         }
     }