diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 6665c97415..4040810cdc 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -2262,7 +2262,7 @@ _elm_gengrid_clear(Evas_Object *obj,
    sd->clear_me = EINA_FALSE;
    sd->pan_changed = EINA_TRUE;
    ELM_SAFE_FREE(sd->calc_job, ecore_job_del);
-   if (sd->selected) sd->selected = eina_list_free(sd->selected);
+   sd->selected = eina_list_free(sd->selected);
    if (sd->clear_cb) sd->clear_cb(sd);
    sd->pan_x = 0;
    sd->pan_y = 0;
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 925671a967..72b676560d 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -793,7 +793,7 @@ _item_tree_effect_finish(Elm_Genlist_Smart_Data *sd)
    evas_object_lower(sd->alpha_bg);
    evas_object_hide(sd->alpha_bg);
    sd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
-   if (sd->move_items) sd->move_items = eina_list_free(sd->move_items);
+   sd->move_items = eina_list_free(sd->move_items);
 
    evas_object_smart_callback_call(sd->pan_obj, "changed", NULL);
    evas_object_smart_callback_call
@@ -6508,8 +6508,7 @@ elm_genlist_item_fields_update(Elm_Object_Item *item,
           {
              Evas_Object* eobj;
              Eina_List* l;
-             eina_list_free(it->item_focus_chain);
-             it->item_focus_chain = NULL;
+             it->item_focus_chain = eina_list_free(it->item_focus_chain);
              EINA_LIST_FOREACH(it->content_objs, l, eobj)
                if (elm_object_focus_allow_get(eobj))
                  it->item_focus_chain = eina_list_append(it->item_focus_chain, eobj);
diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index b8549821d2..378756638b 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -1672,7 +1672,7 @@ _overlay_group_coord_member_update(Overlay_Group *grp,
    _coord_to_region_convert
      (grp->wsd, x, y, grp->wsd->size.w, &grp->lon, &grp->lat);
 
-   if (grp->members) eina_list_free(grp->members);
+   eina_list_free(grp->members);
    grp->members = members;
    snprintf(text, sizeof(text), "%d", eina_list_count(members));
 
@@ -1728,9 +1728,9 @@ _overlay_group_free(Overlay_Group *grp)
 {
    EINA_SAFETY_ON_NULL_RETURN(grp);
 
-   if (grp->overlay) free(grp->overlay);
+   free(grp->overlay);
    if (grp->ovl) _overlay_default_free(grp->ovl);
-   if (grp->members) eina_list_free(grp->members);
+   eina_list_free(grp->members);
 
    free(grp);
 }