diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 1388d5f57e..0f7d982ab7 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -543,7 +543,7 @@ namespace MWMechanics
 
                     std::string texture = "";
 
-                    // TODO: Choosing whether to apply the override texture should be chosen based on nodes in the .NIF file.
+                    // TODO: Applying the override texture should depend on texture properties in the .NIF file and not use special cases.
                     if (magicEffect->mHit.empty() || magicEffect->mHit == "VFX_DefaultHit" || magicEffect->mHit == "VFX_MysticismHit"
                         || magicEffect->mHit == "VFX_SoulTrapHit")                        
                         texture = magicEffect->mParticle;
@@ -937,7 +937,7 @@ namespace MWMechanics
 
             MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
 
-            if (mCaster.getClass().isActor()) // TODO: Non-actors (except for large statics?) should also create a spell cast vfx
+            if (mCaster.getClass().isActor()) // TODO: Non-actors should also create a spell cast vfx
             {
                 const ESM::Static* castStatic;
                 std::string texture = "";
@@ -947,7 +947,7 @@ namespace MWMechanics
                 else
                     castStatic = store.get<ESM::Static>().find ("VFX_DefaultCast");
 
-                // TODO: Choosing whether to apply the override texture should be chosen based on nodes in the .NIF file.
+                // TODO: Applying the override texture should depend on texture properties in the .NIF file and not use special cases.
                 if (effect->mCasting.empty() || effect->mCasting == "VFX_DefaultCast" || effect->mCasting == "VFX_ShieldCast")
                         texture = effect->mParticle;
 
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index 277ac58695..befc6e1da3 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -80,7 +80,7 @@ namespace
             const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
                 effects.mList.begin()->mEffectID);
 
-            // TODO: Choosing whether to apply the override texture should be chosen based on nodes in the .NIF file.
+            // TODO: Applying the override texture should depend on texture properties in the .NIF file and not use special cases.
             if (magicEffect->mBolt.empty() || magicEffect->mBolt == "VFX_DefaultBolt" || magicEffect->mBolt == "VFX_DestructBolt")
                 texture = magicEffect->mParticle;
         }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 25ed74d0cc..3b67164b3a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3174,7 +3174,7 @@ namespace MWWorld
 
             std::string texture = "";
 
-            // TODO: Choosing whether to apply the override texture should be chosen based on nodes in the .NIF file.
+            // TODO: Applying the override texture should depend on texture properties in the .NIF file and not use special cases.
             if (effect->mArea.empty() || effect->mArea == "VFX_DefaultArea")
                 texture = effect->mParticle;