diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 28c66d0cbf..846287964c 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -260,8 +260,8 @@ _db_fill_class(Eo_Class_Def *kls)
 
    eina_hash_set(_classesf, kls->base.file, cl);
 
-   if (kls->comment)
-     cl->description = eina_stringshare_ref(kls->comment);
+   if (kls->description)
+     cl->description = eina_stringshare_ref(kls->description);
 
    EINA_LIST_FOREACH(kls->inherits, l, s)
      cl->inherits = eina_list_append(cl->inherits, eina_stringshare_add(s));
diff --git a/src/lib/eolian/database_function.c b/src/lib/eolian/database_function.c
index 75cd76554c..c29f079cde 100644
--- a/src/lib/eolian/database_function.c
+++ b/src/lib/eolian/database_function.c
@@ -23,12 +23,3 @@ database_function_del(Eolian_Function *fid)
    if (fid->set_return_comment) eina_stringshare_del(fid->set_return_comment);
    free(fid);
 }
-
-Eolian_Function *
-database_function_new(const char *function_name, Eolian_Function_Type foo_type)
-{
-   Eolian_Function *fid = calloc(1, sizeof(*fid));
-   fid->name = eina_stringshare_add(function_name);
-   fid->type = foo_type;
-   return fid;
-}
diff --git a/src/lib/eolian/database_function_parameter.c b/src/lib/eolian/database_function_parameter.c
index 5c00993bd9..9f2262735b 100644
--- a/src/lib/eolian/database_function_parameter.c
+++ b/src/lib/eolian/database_function_parameter.c
@@ -1,19 +1,6 @@
 #include <Eina.h>
 #include "eolian_database.h"
 
-Eolian_Function_Parameter *
-database_parameter_add(Eolian_Type *type, Eolian_Expression *value,
-                       const char *name, const char *description)
-{
-   Eolian_Function_Parameter *param = NULL;
-   param = calloc(1, sizeof(*param));
-   param->name = eina_stringshare_add(name);
-   param->type = type;
-   param->value = value;
-   param->description = eina_stringshare_add(description);
-   return param;
-}
-
 void
 database_parameter_del(Eolian_Function_Parameter *pdesc)
 {
diff --git a/src/lib/eolian/eo_definitions.c b/src/lib/eolian/eo_definitions.c
index 2bc965a762..2d0b164d98 100644
--- a/src/lib/eolian/eo_definitions.c
+++ b/src/lib/eolian/eo_definitions.c
@@ -17,8 +17,8 @@ eo_definitions_class_def_free(Eo_Class_Def *kls)
 
    if (kls->name)
      eina_stringshare_del(kls->name);
-   if (kls->comment)
-     eina_stringshare_del(kls->comment);
+   if (kls->description)
+     eina_stringshare_del(kls->description);
    if (kls->legacy_prefix)
      eina_stringshare_del(kls->legacy_prefix);
    if (kls->eo_prefix)
diff --git a/src/lib/eolian/eo_definitions.h b/src/lib/eolian/eo_definitions.h
index a86ee5a17b..8ea1184a46 100644
--- a/src/lib/eolian/eo_definitions.h
+++ b/src/lib/eolian/eo_definitions.h
@@ -12,18 +12,17 @@ typedef struct _Eo_Class_Def
 {
    Eolian_Object base;
    Eina_Stringshare *name;
-   Eina_Stringshare *file;
    Eolian_Class_Type type;
-   Eina_Stringshare *comment;
+   Eina_Stringshare *description;
    Eina_Stringshare *legacy_prefix;
    Eina_Stringshare *eo_prefix;
    Eina_Stringshare *data_type;
    Eina_List *inherits;
+   Eina_List *properties;
+   Eina_List *methods;
    Eina_List *implements;
    Eina_List *constructors;
    Eina_List *events;
-   Eina_List *properties;
-   Eina_List *methods;
 } Eo_Class_Def;
 
 /* TEMPS */
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index bf905b1036..462cd14314 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1808,7 +1808,7 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type)
              has_events        = EINA_FALSE;
    if (ls->t.token == TOK_COMMENT)
      {
-        ls->tmp.kls->comment = eina_stringshare_ref(ls->t.value.s);
+        ls->tmp.kls->description = eina_stringshare_ref(ls->t.value.s);
         eo_lexer_get(ls);
      }
    if (type == EOLIAN_CLASS_INTERFACE)
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 3d1f064d63..ab656cc91d 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -277,13 +277,9 @@ Eolian_Class *database_class_add(const char *class_name, Eolian_Class_Type type)
 void database_class_del(Eolian_Class *cl);
 
 /* functions */
-
-Eolian_Function *database_function_new(const char *function_name, Eolian_Function_Type foo_type);
 void database_function_del(Eolian_Function *fid);
 
 /* func parameters */
-
-Eolian_Function_Parameter *database_parameter_add(Eolian_Type *type, Eolian_Expression *value, const char *name, const char *description);
 void database_parameter_del(Eolian_Function_Parameter *pdesc);
 
 /* implements */
@@ -295,8 +291,6 @@ void database_implement_del(Eolian_Implement *impl);
 void database_constructor_del(Eolian_Constructor *ctor);
 
 /* events */
-
-Eolian_Event *database_event_new(const char *event_name, const char *event_type, const char *event_desc);
 void database_event_del(Eolian_Event *event);