diff --git a/rebar.config b/rebar.config
index aecc6a1..017e3fe 100644
--- a/rebar.config
+++ b/rebar.config
@@ -8,11 +8,7 @@
 {erl_first_files, ["ec_dictionary", "ec_vsn"]}.
 
 %% Compiler Options ============================================================
-{erl_opts,
- [{platform_define, "^2",        unicode_str},
-  {platform_define, "^(R|1|20)", fun_stacktrace},
-  debug_info,
-  warnings_as_errors]}.
+{erl_opts, [debug_info, warnings_as_errors]}.
 
 %% EUnit =======================================================================
 {eunit_opts, [verbose,
diff --git a/src/ec_plists.erl b/src/ec_plists.erl
index cd9b915..221075b 100644
--- a/src/ec_plists.erl
+++ b/src/ec_plists.erl
@@ -858,21 +858,6 @@ cluster_runmany(_, _, [_Non|_Empty], []=_Nodes, []=_Running, _) ->
 %% We have data, but no nodes either available or occupied
     erlang:exit(allnodescrashed).
 
--ifdef(fun_stacktrace).
-runmany_wrap(Fun, Parent) ->
-    try
-        Fun()
-    catch
-        exit:siblingdied ->
-            ok;
-        exit:Reason ->
-            Parent ! {erlang:self(), error, Reason};
-        error:R ->
-            Parent ! {erlang:self(), error, {R, erlang:get_stacktrace()}};
-        throw:R ->
-            Parent ! {erlang:self(), error, {{nocatch, R}, erlang:get_stacktrace()}}
-    end.
--else.
 runmany_wrap(Fun, Parent) ->
     try
         Fun()
@@ -886,7 +871,6 @@ runmany_wrap(Fun, Parent) ->
         throw:R:Stacktrace ->
             Parent ! {erlang:self(), error, {{nocatch, R}, Stacktrace}}
     end.
--endif.
 
 delete_running(Pid, [{Pid, Node, List}|Running], Acc) ->
     {Running ++ Acc, Node, List};