diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 085f614d4e..55ae838cd6 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -169,8 +169,7 @@ ffi.cdef [[
         EOLIAN_TYPE_BUILTIN_STRINGSHARE,
         EOLIAN_TYPE_BUILTIN_STRBUF,
 
-        EOLIAN_TYPE_BUILTIN_VOID_PTR,
-        EOLIAN_TYPE_BUILTIN_FREE_CB
+        EOLIAN_TYPE_BUILTIN_VOID_PTR
     } Eolian_Type_Builtin_Type;
 
     typedef enum {
@@ -973,8 +972,7 @@ M.type_builtin_type = {
    STRINGSHARE   = 46,
    STRBUF        = 47,
 
-   VOID_PTR      = 48,
-   FREE_CB       = 49
+   VOID_PTR      = 48
 }
 
 M.typedecl_type = {
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 4d743087ed..2c23da328e 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -348,8 +348,7 @@ typedef enum
    EOLIAN_TYPE_BUILTIN_STRINGSHARE,
    EOLIAN_TYPE_BUILTIN_STRBUF,
 
-   EOLIAN_TYPE_BUILTIN_VOID_PTR,
-   EOLIAN_TYPE_BUILTIN_FREE_CB
+   EOLIAN_TYPE_BUILTIN_VOID_PTR
 } Eolian_Type_Builtin_Type;
 
 typedef enum
diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c
index 66d8a97f62..b0d1ac1bee 100644
--- a/src/lib/eolian/database_type.c
+++ b/src/lib/eolian/database_type.c
@@ -189,17 +189,6 @@ static void
 _atype_to_str(const Eolian_Typedecl *tp, Eina_Strbuf *buf)
 {
    eina_strbuf_append(buf, "typedef ");
-
-   if (tp->base_type->type == EOLIAN_TYPE_REGULAR)
-     {
-        if (!strcmp(tp->base_type->base.name, "__builtin_free_cb"))
-          {
-             eina_strbuf_append(buf, "void (*");
-             eina_strbuf_append(buf, tp->base.c_name);
-             eina_strbuf_append(buf, ")(void *data)");
-             return;
-          }
-     }
    database_type_to_str(tp->base_type, buf, tp->base.c_name,
                         EOLIAN_C_TYPE_DEFAULT);
 }
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c
index c5945724ef..1ca8240008 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -291,7 +291,6 @@ _validate_type(Validate_State *vals, Eolian_Type *tp)
                   {
                    case KW_void_ptr:
                    case KW___undefined_type:
-                   case KW___builtin_free_cb:
                      if (vals->stable)
                        {
                           _eo_parser_log(&tp->base,
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index e2ce990304..c70b1c9031 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -64,7 +64,6 @@ enum Tokens
     KW(mstring), KW(string), KW(stringshare), KW(strbuf), \
     \
     KW(void_ptr), \
-    KW(__builtin_free_cb), \
     KW(function), \
     KW(__undefined_type), \
     \
diff --git a/src/tests/eolian/data/typedef.eo b/src/tests/eolian/data/typedef.eo
index ab4d991954..2e017324be 100644
--- a/src/tests/eolian/data/typedef.eo
+++ b/src/tests/eolian/data/typedef.eo
@@ -8,8 +8,6 @@ type @extern Evas.Pants: float; /* not generated */
 
 type @beta Undef: __undefined_type; /* not generated */
 
-type @beta Free: __builtin_free_cb; /* specially generated */
-
 enum Enum.Bar
 {
    legacy: bar;
diff --git a/src/tests/eolian/data/typedef_ref.h b/src/tests/eolian/data/typedef_ref.h
index c03f18ca55..24583b590f 100644
--- a/src/tests/eolian/data/typedef_ref.h
+++ b/src/tests/eolian/data/typedef_ref.h
@@ -19,10 +19,6 @@ typedef Evas_Coord Evas_Coord2;
 
 typedef Evas_Coord2 Evas_Coord3;
 
-#ifdef EFL_BETA_API_SUPPORT
-typedef void (*Free)(void *data);
-#endif /* EFL_BETA_API_SUPPORT */
-
 typedef enum
 {
   BAR_FIRST_ITEM = 0,
diff --git a/src/tests/eolian/data/typedef_ref_stub.h b/src/tests/eolian/data/typedef_ref_stub.h
index 3bbb7d2417..0f6f4ec38b 100644
--- a/src/tests/eolian/data/typedef_ref_stub.h
+++ b/src/tests/eolian/data/typedef_ref_stub.h
@@ -11,9 +11,5 @@ typedef Evas_Coord Evas_Coord2;
 
 typedef Evas_Coord2 Evas_Coord3;
 
-#ifdef EFL_BETA_API_SUPPORT
-typedef void (*Free)(void *data);
-#endif /* EFL_BETA_API_SUPPORT */
-
 
 #endif
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index f1294b720c..7d680af4ec 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -402,8 +402,6 @@ EFL_START_TEST(eolian_typedef)
    fail_if(!eina_iterator_next(iter, (void**)&tdl));
    /* not generated undefined type, skip */
    fail_if(!eina_iterator_next(iter, (void**)&tdl));
-   /* free cb, tested by generation tests */
-   fail_if(!eina_iterator_next(iter, (void**)&tdl));
    fail_if(eina_iterator_next(iter, (void**)&tdl));
 
    eolian_state_free(eos);