diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
index 7d39f47752..9787306016 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
@@ -1336,8 +1336,7 @@ ecore_x_icccm_command_get(Ecore_X_Window window __UNUSED__,
 
    if (c < 1)
      {
-	if (v)
-	  free(v);
+	free(v);
 	return;
      }
 
diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index 32054ae13d..d0e2629563 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -472,7 +472,7 @@ _edje_part_id_set(Edje *ed, Edje_Real_Part *rp, int new_id)
    if (!part) return;
    //printf("CHANGE ID OF PART %s TO %d\n", part->name, new_id);
 
-   if (!ed || !part || new_id < -1) return;
+   if (!ed || new_id < -1) return;
 
    if (part->id == new_id) return;
 
@@ -6122,8 +6122,9 @@ _edje_generate_source_of_group(Edje *ed, const char *group, Eina_Strbuf *buf)
 
 	EINA_LIST_FOREACH(ll, l, data)
 	  {
-	     BUF_APPENDF(I3"item: \"%s\" \"%s\";\n", data,
-		     edje_edit_group_data_value_get(obj, data));
+	     const char *value = edje_edit_group_data_value_get(obj, data);
+	     ret &= !!value;
+	     BUF_APPENDF(I3"item: \"%s\" \"%s\";\n", data, value);
 	  }
 
 	BUF_APPEND(I2"}\n\n");
@@ -6157,7 +6158,7 @@ _edje_generate_source_of_group(Edje *ed, const char *group, Eina_Strbuf *buf)
      {
 	BUF_APPEND(I2 "programs {\n");
 	EINA_LIST_FOREACH(ll, l, data)
-	  _edje_generate_source_of_program(obj, data, buf);
+	  ret &= _edje_generate_source_of_program(obj, data, buf);
 	BUF_APPEND(I2 "}\n");
 	edje_edit_string_list_free(ll);
      }
diff --git a/legacy/eet/src/lib/eet_cipher.c b/legacy/eet/src/lib/eet_cipher.c
index a4e98809e9..9266e7f820 100644
--- a/legacy/eet/src/lib/eet_cipher.c
+++ b/legacy/eet/src/lib/eet_cipher.c
@@ -851,7 +851,7 @@ eet_cipher(const void *data, unsigned int size, const char *key, unsigned int le
    if (opened) EVP_CIPHER_CTX_cleanup(&ctx);
 # endif
    /* General error */
-   if (ret) free(ret);
+   free(ret);
    if (result) *result = NULL;
    if (result_length) *result_length = 0;
 
diff --git a/legacy/eet/src/lib/eet_image.c b/legacy/eet/src/lib/eet_image.c
index 0636581ecf..c3be1f12a8 100644
--- a/legacy/eet/src/lib/eet_image.c
+++ b/legacy/eet/src/lib/eet_image.c
@@ -1334,7 +1334,7 @@ eet_data_image_decode_cipher(const void *data, const char *cipher_key, int size,
 
    if (!_eet_data_image_decode_inside(data, size, 0, 0, iw, ih, d, iw, ih, iw * 4, ialpha, icompress, iquality, ilossy))
      {
-	if (d) free(d);
+	free(d);
 	return NULL;
      }
 
diff --git a/legacy/eet/src/lib/eet_lib.c b/legacy/eet/src/lib/eet_lib.c
index cc87909d9f..651e15e147 100644
--- a/legacy/eet/src/lib/eet_lib.c
+++ b/legacy/eet/src/lib/eet_lib.c
@@ -639,7 +639,7 @@ eet_flush2(Eet_File *ef)
 	  }
      }
    sign_error:
-   if (fp) fclose(fp);
+   fclose(fp);
    return error;
 }
 
diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c
index 244e13bb68..e27832c21b 100644
--- a/legacy/efreet/src/lib/efreet_desktop.c
+++ b/legacy/efreet/src/lib/efreet_desktop.c
@@ -1414,7 +1414,7 @@ efreet_desktop_cache_update_cb(void *data __UNUSED__, Ecore_File_Monitor *em __U
     ecore_event_add(EFREET_EVENT_DESKTOP_CACHE_UPDATE, ev, efreet_desktop_cache_update_free, d);
     return;
 error:
-    if (tmp) eet_close(tmp);
+    eet_close(tmp);
 }
 
 static void
diff --git a/legacy/evas/src/lib/cache/evas_cache_engine_image.c b/legacy/evas/src/lib/cache/evas_cache_engine_image.c
index ca9f9aaa97..7b15b099e8 100644
--- a/legacy/evas/src/lib/cache/evas_cache_engine_image.c
+++ b/legacy/evas/src/lib/cache/evas_cache_engine_image.c
@@ -671,14 +671,10 @@ evas_cache_engine_image_engine(Evas_Cache_Engine_Image *cache, void *engine_data
 
   on_error:
    if (!eim)
-     {
-        if (ie)
-          evas_cache_image_drop(ie);
-     }
+     evas_cache_image_drop(ie);
    else
-     {
-        evas_cache_engine_image_drop(eim);
-     }
+     evas_cache_engine_image_drop(eim);
+
    return NULL;
 }
 
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 6106566a73..c19a91ba9e 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -3806,8 +3806,8 @@ evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Text
 	else if (l2 == EINA_INLIST_GET(cur2->node)) return -1; /* cur1 < cur 2 */
 	else if (!l1) return -1; /* cur1 < cur 2 */
 	else if (!l2) return 1; /* cur2 < cur 1 */
-	if (l1) l1 = l1->prev;
-	if (l2) l2 = l2->next;
+	l1 = l1->prev;
+	l2 = l2->next;
      }
    return 0;
 }
diff --git a/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c b/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
index df3d4be4be..857b6e16a5 100644
--- a/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
+++ b/legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c
@@ -631,9 +631,9 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
 	  break;
      }
 
-   if (cmap) free(cmap);
-   if (line) free(line);
-   if (f) fclose(f);
+   free(cmap);
+   free(line);
+   fclose(f);
 
    xpm_parse_done();
    *error = EVAS_LOAD_ERROR_NONE;