diff --git a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
index 0ec1573084..bf89c73c5e 100644
--- a/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
+++ b/src/lib/ecore_audio/ecore_audio_obj_in_tone.c
@@ -101,9 +101,7 @@ _ecore_audio_in_tone_eo_base_key_data_get(Eo *eo_obj, Ecore_Audio_In_Tone_Data *
   if (!strcmp(key, ECORE_AUDIO_ATTR_TONE_FREQ)) {
       return (void *) (intptr_t) obj->freq;
   } else {
-      void *ret = NULL;
-      ret = eo_key_data_get(eo_super(eo_obj, MY_CLASS), key);
-      return ret;
+      return eo_key_data_get(eo_super(eo_obj, MY_CLASS), key);
   }
 }
 
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index fd05522dd4..107ccfd41f 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -4,16 +4,12 @@
 EAPI Eina_Bool
 ecore_con_url_url_set(Ecore_Con_Url *obj, const char *url)
 {
-   Eina_Bool ret;
-   ret = efl_network_url_set((Ecore_Con_Url *)obj, url);
-   return ret;
+   return efl_network_url_set((Ecore_Con_Url *)obj, url);
 }
 
 EAPI const char *
 ecore_con_url_url_get(const Ecore_Con_Url *obj)
 {
-   const char * ret;
-   ret = efl_network_url_get((Ecore_Con_Url *)obj);
-   return ret;
+   return efl_network_url_get((Ecore_Con_Url *)obj);
 }
 
diff --git a/src/lib/ector/ector_renderer_buffer.c b/src/lib/ector/ector_renderer_buffer.c
index 4ba7287ee4..4bb93a24c1 100644
--- a/src/lib/ector/ector_renderer_buffer.c
+++ b/src/lib/ector/ector_renderer_buffer.c
@@ -42,14 +42,4 @@ _ector_renderer_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Dat
    return pd->eo_buffer;
 }
 
-EOLIAN static Eo_Base *
-_ector_renderer_buffer_eo_base_constructor(Eo *obj, Ector_Renderer_Buffer_Data *pd EINA_UNUSED)
-{
-   Eo_Base *ret;
-
-   ret = eo_constructor(eo_super(obj, MY_CLASS));
-
-   return ret;
-}
-
 #include "ector_renderer_buffer.eo.c"
diff --git a/src/lib/ector/ector_renderer_buffer.eo b/src/lib/ector/ector_renderer_buffer.eo
index fd21bd7c70..477d5ee7cd 100644
--- a/src/lib/ector/ector_renderer_buffer.eo
+++ b/src/lib/ector/ector_renderer_buffer.eo
@@ -12,7 +12,6 @@ mixin Ector.Renderer.Buffer (Eo.Interface, Ector.Renderer, Efl.Gfx.Fill)
       }
    }
    implements {
-      Eo.Base.constructor;
       Efl.Gfx.Fill.fill.get;
       Efl.Gfx.Fill.fill.set;
    }
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 03fda4c419..f2073da239 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -461,9 +461,7 @@ edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
 EAPI Eina_Bool
 edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
 {
-   Eina_Bool ret = 0;
-   ret = efl_file_set(obj, file, group);
-   return ret;
+   return efl_file_set(obj, file, group);
 }
 
 EAPI void
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 11cace6f50..6410d54dbb 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1282,9 +1282,7 @@ _efl_ui_image_efl_ui_draggable_drag_target_get(Eo *obj EINA_UNUSED, Efl_Ui_Image
 EAPI Eina_Bool
 elm_image_animated_available_get(const Evas_Object *obj)
 {
-   Eina_Bool ret;
-   ret = efl_player_playable_get(obj);
-   return ret;
+   return efl_player_playable_get(obj);
 }
 
 EOLIAN static Eina_Bool
@@ -1326,8 +1324,6 @@ _efl_ui_image_animated_set_internal(Eo *obj, Efl_Ui_Image_Data *sd, Eina_Bool an
         sd->cur_frame = -1;
         sd->frame_duration = -1;
      }
-
-   return;
 }
 
 static Eina_Bool
@@ -1733,11 +1729,8 @@ elm_image_file_get(const Eo *obj, const char **file, const char **group)
 EAPI Eina_Bool
 elm_image_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group)
 {
-   Eina_Bool ret = EINA_FALSE;
-
    EFL_UI_IMAGE_CHECK(obj) EINA_FALSE;
-   ret = efl_file_mmap_set(obj, file, group);
-   return ret;
+   return efl_file_mmap_set(obj, file, group);
 }
 
 EAPI Eina_Bool
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 36c32bba4d..bffaadcd9b 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6915,9 +6915,7 @@ elm_win_window_id_get(const Evas_Object *obj)
 
    ELM_WIN_CHECK(obj) 0;
    ELM_WIN_DATA_GET_OR_RETURN(obj, sd, 0);
-   Ecore_Window ret = 0;
-   ret = _elm_win_window_id_get(sd);
-   return ret;
+   return _elm_win_window_id_get(sd);
 }
 
 EAPI void
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index e5c3bafcb2..f0469f1433 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -2047,9 +2047,7 @@ EAPI Eina_Bool
 elm_fileselector_is_save_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
-   Eina_Bool ret = EINA_FALSE;
-   ret = elm_interface_fileselector_is_save_get((Eo *) obj);
-   return ret;
+   return elm_interface_fileselector_is_save_get((Eo *) obj);
 }
 
 EOLIAN static Eina_Bool
@@ -2082,9 +2080,7 @@ EAPI Eina_Bool
 elm_fileselector_folder_only_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
-   Eina_Bool ret = EINA_FALSE;
-   ret = elm_interface_fileselector_folder_only_get((Eo *) obj);
-   return ret;
+   return elm_interface_fileselector_folder_only_get((Eo *) obj);
 }
 
 EOLIAN static Eina_Bool
@@ -2160,9 +2156,7 @@ EAPI Eina_Bool
 elm_fileselector_expandable_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
-   Eina_Bool ret = EINA_FALSE;
-   ret = elm_interface_fileselector_expandable_get((Eo *) obj);
-   return ret;
+   return elm_interface_fileselector_expandable_get((Eo *) obj);
 }
 
 EOLIAN static Eina_Bool
@@ -2283,9 +2277,7 @@ EAPI Elm_Fileselector_Mode
 elm_fileselector_mode_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_LAST);
-   Elm_Fileselector_Mode ret = ELM_FILESELECTOR_LAST;
-   ret = elm_interface_fileselector_mode_get((Eo *) obj);
-   return ret;
+   return elm_interface_fileselector_mode_get((Eo *) obj);
 }
 
 EOLIAN static Elm_Fileselector_Mode
@@ -2340,9 +2332,7 @@ EAPI Eina_Bool
 elm_fileselector_multi_select_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
-   Eina_Bool ret = EINA_FALSE;
-   ret = elm_interface_fileselector_multi_select_get((Eo *) obj);
-   return ret;
+   return elm_interface_fileselector_multi_select_get((Eo *) obj);
 }
 
 EOLIAN static Eina_Bool
@@ -2625,9 +2615,7 @@ EAPI Eina_Bool
 elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_type, const char *filter_name)
 {
    ELM_FILESELECTOR_CHECK(obj) EINA_FALSE;
-   Eina_Bool ret = EINA_FALSE;
-   ret = elm_interface_fileselector_mime_types_filter_append(obj, mime_type, filter_name);
-   return ret;
+   return elm_interface_fileselector_mime_types_filter_append(obj, mime_type, filter_name);
 }
 
 EOLIAN static Eina_Bool
@@ -2670,9 +2658,7 @@ EAPI Eina_Bool
 elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
-   Eina_Bool ret = EINA_FALSE;
-   ret = elm_interface_fileselector_custom_filter_append(obj, func, data, filter_name);
-   return ret;
+   return elm_interface_fileselector_custom_filter_append(obj, func, data, filter_name);
 }
 
 EOLIAN static Eina_Bool
@@ -2781,9 +2767,7 @@ EAPI Eina_Bool
 elm_fileselector_hidden_visible_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
-   Eina_Bool ret = EINA_FALSE;
-   ret = elm_interface_fileselector_hidden_visible_get((Eo *) obj);
-   return ret;
+   return elm_interface_fileselector_hidden_visible_get((Eo *) obj);
 }
 
 EOLIAN static Eina_Bool
@@ -2891,10 +2875,7 @@ EAPI Elm_Fileselector_Sort
 elm_fileselector_sort_method_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, ELM_FILESELECTOR_SORT_LAST);
-   Elm_Fileselector_Sort ret = ELM_FILESELECTOR_SORT_LAST;
-   ret = elm_interface_fileselector_sort_method_get((Eo *) obj);
-
-   return ret;
+   return elm_interface_fileselector_sort_method_get((Eo *) obj);
 }
 
 EOLIAN static Elm_Fileselector_Sort
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 1fe513cd02..84cca831cd 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4951,11 +4951,7 @@ _elm_gengrid_item_elm_widget_item_tooltip_window_mode_set(Eo *eo_it, Elm_Gen_Ite
 {
    it->tooltip.free_size = disable;
    if (VIEW(it))
-     {
-        Eina_Bool ret;
-        ret = elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), disable);
-        return ret;
-     }
+     return elm_wdg_item_tooltip_window_mode_set(eo_super(eo_it, ELM_GENGRID_ITEM_CLASS), disable);
 
    return EINA_TRUE;
 }
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index df0d93457d..4b5a08ada7 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -744,9 +744,7 @@ EAPI Evas_Object *
 elm_hover_parent_get(const Evas_Object *obj)
 {
    ELM_HOVER_CHECK(obj) NULL;
-   Evas_Object *ret = NULL;
-   ret = elm_obj_widget_parent_get((Eo *) obj);
-   return ret;
+   return elm_obj_widget_parent_get((Eo *) obj);
 }
 
 EOLIAN static Evas_Object*
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 55e77eddf7..a776980363 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -638,7 +638,6 @@ elm_icon_memfile_set(Evas_Object *obj,
                      const char *format,
                      const char *key)
 {
-   Eina_Bool int_ret = EINA_FALSE;
    ELM_ICON_CHECK(obj) EINA_FALSE;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(img, EINA_FALSE);
@@ -649,8 +648,7 @@ elm_icon_memfile_set(Evas_Object *obj,
 
    _edje_signals_free(sd);
 
-   int_ret = elm_image_memfile_set(eo_super(obj, MY_CLASS), img, size, format, key);
-   return int_ret;
+   return elm_image_memfile_set(eo_super(obj, MY_CLASS), img, size, format, key);
 }
 
 EAPI Eina_Bool
@@ -661,9 +659,7 @@ elm_icon_file_set(Evas_Object *obj,
    ELM_ICON_CHECK(obj) EINA_FALSE;
    EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
 
-   Eina_Bool ret = EINA_FALSE;
-   ret = efl_file_set(obj, file, group);
-   return ret;
+   return efl_file_set(obj, file, group);
 }
 
 EAPI void
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index ebc21cd5aa..5bc127164a 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -1106,9 +1106,7 @@ elm_layout_content_unset(Evas_Object *obj,
                          const char *swallow)
 {
    ELM_LAYOUT_CHECK(obj) NULL;
-   Evas_Object *ret = NULL;
-   ret = efl_content_unset(efl_part(obj, swallow));
-   return ret;
+   return efl_content_unset(efl_part(obj, swallow));
 }
 
 static Evas_Object*
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 6eb5c1b54b..726c5cffb4 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -872,9 +872,7 @@ EAPI Evas_Object *
 elm_menu_parent_get(const Evas_Object *obj)
 {
    ELM_MENU_CHECK(obj) NULL;
-   Evas_Object *ret = NULL;
-   ret = elm_obj_widget_parent_get(obj);
-   return ret;
+   return elm_obj_widget_parent_get(obj);
 }
 
 EOLIAN static Evas_Object*
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 467e85da73..139fbe71f8 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -1057,9 +1057,7 @@ elm_scroller_single_direction_get(const Evas_Object *obj)
 EOLIAN static Elm_Scroller_Single_Direction
 _elm_scroller_elm_interface_scrollable_single_direction_get(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
 {
-   Elm_Scroller_Single_Direction ret = ELM_SCROLLER_SINGLE_DIRECTION_NONE;
-   ret = elm_interface_scrollable_single_direction_get(eo_super(obj, MY_CLASS));
-   return ret;
+   return elm_interface_scrollable_single_direction_get(eo_super(obj, MY_CLASS));
 }
 
 EAPI void
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 822514e894..672cc7d5ec 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -4017,10 +4017,7 @@ _elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, El
 EOLIAN static Elm_Atspi_State_Set
 _elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED)
 {
-   Elm_Atspi_State_Set ret;
-   ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_TOOLBAR_CLASS));
-
-   return ret;
+   return elm_interface_atspi_accessible_state_set_get(eo_super(obj, ELM_TOOLBAR_CLASS));
 }
 
 EOLIAN int
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index c95b2bdf5b..52cb4e2e8c 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1117,7 +1117,6 @@ _elm_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *
 EAPI Eina_Bool
 elm_widget_sub_object_parent_add(Evas_Object *sobj)
 {
-   Eina_Bool ret = EINA_FALSE;
    Eo *parent = NULL;
 
    parent = eo_parent_get(sobj);
@@ -1125,12 +1124,10 @@ elm_widget_sub_object_parent_add(Evas_Object *sobj)
      {
         ERR("You passed a wrong parent parameter (%p %s). "
             "Elementary widget's parent should be an elementary widget.", parent, evas_object_type_get(parent));
-        return ret;
+        return EINA_FALSE;
      }
 
-   ret = elm_obj_widget_sub_object_add(parent, sobj);
-
-   return ret;
+   return elm_obj_widget_sub_object_add(parent, sobj);
 }
 
 /*
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index b59b347669..f39471ee62 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -1937,9 +1937,7 @@ evas_object_box_option_property_set(Evas_Object *o, Evas_Object_Box_Option *opt,
 EAPI Eina_Bool
 evas_object_box_option_property_vset(Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
-   Eina_Bool ret = EINA_FALSE;
-   ret = evas_obj_box_option_property_vset(o, opt, property, (va_list *) &args);
-   return ret;
+   return evas_obj_box_option_property_vset(o, opt, property, (va_list *) &args);
 }
 
 EOLIAN static Eina_Bool
@@ -1964,9 +1962,7 @@ evas_object_box_option_property_get(const Evas_Object *o, Evas_Object_Box_Option
 EAPI Eina_Bool
 evas_object_box_option_property_vget(const Evas_Object *o, Evas_Object_Box_Option *opt, int property, va_list args)
 {
-   Eina_Bool ret = EINA_FALSE;
-   ret = evas_obj_box_option_property_vget((Eo *)o, opt, property, (va_list *) &args);
-   return ret;
+   return evas_obj_box_option_property_vget((Eo *)o, opt, property, (va_list *) &args);
 }
 
 EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index c9051fd7b7..c58c61cc97 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1964,11 +1964,10 @@ _evas_canvas_object_top_at_xy_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eva
 EAPI Evas_Object *
 evas_object_top_at_pointer_get(const Evas *eo_e)
 {
-   Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
-   Evas_Object *ret = NULL;
+   Evas_Public_Data *e = eo_isa(eo_e, EVAS_CANVAS_CLASS) ?
+            eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS) : NULL;
    if (!e) return NULL;
-   ret = evas_canvas_object_top_at_xy_get((Eo *)eo_e, e->pointer.x, e->pointer.y, EINA_TRUE, EINA_TRUE);
-   return ret;
+   return evas_canvas_object_top_at_xy_get((Eo *)eo_e, e->pointer.x, e->pointer.y, EINA_TRUE, EINA_TRUE);
 }
 
 EOLIAN Evas_Object*
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 2aec11b401..69d9b822a6 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -49,17 +49,13 @@ _efl_vg_shape_efl_gfx_color_part_set(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
                                           const char * part,
                                           int r, int g, int b, int a)
 {
-   Eina_Bool ret;
-
    if (part && !strcmp(part, "stroke"))
      {
          efl_gfx_shape_stroke_color_set(obj, r, g, b, a);
         return EINA_TRUE;
      }
 
-   ret = efl_gfx_color_part_set(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
-
-   return ret;
+   return efl_gfx_color_part_set(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
 }
 
 static Eina_Bool
@@ -67,17 +63,13 @@ _efl_vg_shape_efl_gfx_color_part_get(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED,
                                           const char * part,
                                           int *r, int *g, int *b, int *a)
 {
-   Eina_Bool ret;
-
    if (part && !strcmp(part, "stroke"))
      {
         efl_gfx_shape_stroke_color_get(obj, r, g, b, a);
         return EINA_TRUE;
      }
 
-   ret = efl_gfx_color_part_get(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
-
-   return ret;
+   return efl_gfx_color_part_get(eo_super(obj, EFL_VG_SHAPE_CLASS), part, r, g, b, a);
 }
 
 static void