diff --git a/src/gd_v_devman.erl b/src/gd_v_devman.erl
index adec361..051334d 100644
--- a/src/gd_v_devman.erl
+++ b/src/gd_v_devman.erl
@@ -838,10 +838,7 @@ open_hash3(State, Address, Source) ->
     Options = sophia_options(),
     case so_compiler:from_string(Source, Options) of
         {ok, Build = #{aci := ACI}} ->
-%           AACI = hz:prepare_aaci(ACI),
-            {Defs = #{functions := Funs}, ConIfaces} = find_main(ACI),
-            Callable = maps:remove("init", Funs),
-            FunDefs = {maps:put(functions, Callable, Defs), ConIfaces},
+            {aaci, _Name, FunDefs, _TypeDefs} = hz:prepare_aaci(ACI),
             ok = tell(info, "Compilation Succeeded!~n~tp~n~n~tp", [Build, FunDefs]),
             add_code_page(State, {hash, Address}, Source);
         Other ->