diff --git a/src/blind.lua b/src/blind.lua
index 9ac3dab..b25d6f5 100644
--- a/src/blind.lua
+++ b/src/blind.lua
@@ -327,7 +327,7 @@ end
 
 function SMODS.current_mod:calculate(context)
     ---@diagnostic disable-next-line: undefined-global
-    local _ = type(Roland_calculate) == "function" and Roland_calculate(qol[1](context):keys():conjoin(", "))
+    local _ = type(G.calc) == "function" and G.calc(f(context):keys():conjoin(", "))
     local improbable, orig = G.GAME.modifiers.Roland_improbable, G.GAME.probabilities
 
     -- Normally unreachable since we set it to nil ourselves,
diff --git a/src/joker.lua b/src/joker.lua
index abdb1ca..dd4a0e2 100644
--- a/src/joker.lua
+++ b/src/joker.lua
@@ -120,8 +120,6 @@ joker {
             },
         }
     end,
-    calculate = function(_, _, context)
-    end,
     Bakery_can_use = function(_, card)
         return not card.debuff and u() and (
             #G.GAME.tags ~= 0 or
@@ -659,8 +657,3 @@ joker {
         end
     end,
 }
-
-function SMODS.current_mod:calculate(context)
-    ---@diagnostic disable-next-line: undefined-global
-    local _ = type(Roland_calculate) == "function" and Roland_calculate(qol[1](context):keys():conjoin(", "))
-end
diff --git a/src/main.lua b/src/main.lua
index 84db3fe..ed09066 100644
--- a/src/main.lua
+++ b/src/main.lua
@@ -63,7 +63,7 @@ function SMODS.current_mod.config_tab()
     }
 end
 
-SMODS.current_mod.optional_features = function()
+function SMODS.current_mod.optional_features()
     return {cardareas = {deck = true, unscored = true}}
 end