diff --git a/src/aeso_ast_to_fcode.erl b/src/aeso_ast_to_fcode.erl
index 8ffa1e7..1e0138e 100644
--- a/src/aeso_ast_to_fcode.erl
+++ b/src/aeso_ast_to_fcode.erl
@@ -1294,14 +1294,12 @@ optimize_fcode(Code = #{ functions := Funs }, Options) ->
 
 -spec optimize_fun(fcode(), fun_name(), fun_def(), [option()]) -> fun_def().
 optimize_fun(Fcode, Fun, Def = #{ body := Body0 }, Options) ->
-    All = proplists:get_value(optimize_all, Options, true),
-
-    Inliner              = proplists:get_value(optimize_inliner,                Options, All),
-    InlineLocalFunctions = proplists:get_value(optimize_inline_local_functions, Options, All),
-    BindSubexpressions   = proplists:get_value(optimize_bind_subexpressions,    Options, All),
-    LetFloating          = proplists:get_value(optimize_let_floating,           Options, All),
-    Simplifier           = proplists:get_value(optimize_simplifier,             Options, All),
-    DropUnusedLets       = proplists:get_value(optimize_drop_unused_lets,       Options, All),
+    Inliner              = proplists:get_value(optimize_inliner,                Options, true),
+    InlineLocalFunctions = proplists:get_value(optimize_inline_local_functions, Options, true),
+    BindSubexpressions   = proplists:get_value(optimize_bind_subexpressions,    Options, true),
+    LetFloating          = proplists:get_value(optimize_let_floating,           Options, true),
+    Simplifier           = proplists:get_value(optimize_simplifier,             Options, true),
+    DropUnusedLets       = proplists:get_value(optimize_drop_unused_lets,       Options, true),
 
     Body1 = if Inliner              -> inliner   (Fcode, Fun, Body0); true -> Body0 end,
     Body2 = if InlineLocalFunctions -> inline_local_functions(Body1); true -> Body1 end,
diff --git a/src/aeso_fcode_to_fate.erl b/src/aeso_fcode_to_fate.erl
index c886e85..9e19be5 100644
--- a/src/aeso_fcode_to_fate.erl
+++ b/src/aeso_fcode_to_fate.erl
@@ -708,8 +708,7 @@ tuple(N) -> aeb_fate_ops:tuple(?a, N).
 %%  Optimize
 
 optimize_scode(Funs, Options) ->
-    All = proplists:get_value(optimize_all, Options, true),
-    case proplists:get_value(optimize_scode, Options, All) of
+    case proplists:get_value(optimize_scode, Options, true) of
         true ->
             maps:map(fun(Name, Def) -> optimize_fun(Funs, Name, Def, Options) end,
                     Funs);