diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index bd54d47ee..65d66f9e2 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -449,13 +449,11 @@ namespace MWGui
         const MWWorld::ESMStore &store =
             MWBase::Environment::get().getWorld()->getStore();
 
-        static const bool vanillaCost = Settings::Manager::getBool("expensive spells", "Game");
-
         for (std::vector<ESM::ENAMstruct>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
         {
             const ESM::ENAMstruct& effect = *it;
 
-            y += std::max(1.f, MWMechanics::calcEffectCost(effect, vanillaCost));
+            y += std::max(1.f, MWMechanics::calcEffectCost(effect));
 
             if (effect.mRange == ESM::RT_Target)
                 y *= 1.5;
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
index 084c3e1e1..ec90fa3ce 100644
--- a/apps/openmw/mwgui/spellcreationdialog.hpp
+++ b/apps/openmw/mwgui/spellcreationdialog.hpp
@@ -3,7 +3,6 @@
 
 #include <components/esm/loadmgef.hpp>
 #include <components/esm/loadspel.hpp>
-#include <components/settings/settings.hpp>
 
 #include "windowbase.hpp"
 #include "referenceinterface.hpp"
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 83af249da..14dfac283 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -49,13 +49,13 @@ namespace MWMechanics
         return schoolSkillMap[school];
     }
 
-    float calcEffectCost(const ESM::ENAMstruct& effect, const bool customSpellCost)
+    float calcEffectCost(const ESM::ENAMstruct& effect)
     {
         const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectID);
-        return calcEffectCost(effect, magicEffect, customSpellCost);
+        return calcEffectCost(effect, magicEffect);
     }
 
-    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect, const bool customSpellCost)
+    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect)
     {
         int minMagn = 1;
         int maxMagn = 1;
@@ -65,12 +65,9 @@ namespace MWMechanics
             maxMagn = effect.mMagnMax;
         }
 
-        int duration = 0;
+        int duration = 1;
         if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
             duration = effect.mDuration;
-        //The wonders of vanilla spellmaking
-        if (customSpellCost && duration < 1)
-            duration = 1;
 
         static const float fEffectCostMult = MWBase::Environment::get().getWorld()->getStore()
             .get<ESM::GameSetting>().find("fEffectCostMult")->mValue.getFloat();
diff --git a/apps/openmw/mwmechanics/spellcasting.hpp b/apps/openmw/mwmechanics/spellcasting.hpp
index 836473653..2844e7f23 100644
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@@ -25,8 +25,8 @@ namespace MWMechanics
 
     ESM::Skill::SkillEnum spellSchoolToSkill(int school);
 
-    float calcEffectCost(const ESM::ENAMstruct& effect, const bool customSpellCost = false);
-    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect, const bool customSpellCost = false);
+    float calcEffectCost(const ESM::ENAMstruct& effect);
+    float calcEffectCost(const ESM::ENAMstruct& effect, const ESM::MagicEffect* magicEffect);
 
     bool isSummoningEffect(int effectId);
 
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 352b86f65..09672aaac 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -228,10 +228,7 @@ barter disposition change is permanent = false
 # Uses the MCP formula (damage * (strength / 40)) to factor Strength into hand-to-hand combat.
 # (0 means it does not factor it in, 1 means it factors into werewolves damage calculation and
 # 2 means werewolves are ignored) 
-strength influences hand to hand = 0
-
-# Makes custom spells cost the same as in vanilla
-expensive spells = true
+strength influences hand to hand = 0
 
 [General]