elm: Removed unnecessary null check for ecore_timer_del,

 ecore_animator_del, and ecore_job_del.

As all efl public free apis get null as valid parameter, we do not need
to check null. I also removed some null check for other free apis which
were right next to timer/animator/job del. After this job code got
cleaner.

32 files changed, 175 insertions, 189 deletions

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index cd236181b..6143f2ae0 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -504,7 +504,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
    nit = (Elm_Naviframe_Item *)it;
    ELM_NAVIFRAME_DATA_GET(WIDGET(nit), sd);
 
-   if (nit->animator) ecore_animator_del(nit->animator);
+   ecore_animator_del(nit->animator);
 
    top = (it == elm_naviframe_top_item_get(WIDGET(nit)));
    if (evas_object_data_get(VIEW(nit), "out_of_list"))
@@ -1397,7 +1397,7 @@ _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    //All popping items which are not called yet by animator.
    EINA_LIST_FREE(sd->popping, it)
      {
-        if (it->animator) ecore_animator_del(it->animator);
+        ecore_animator_del(it->animator);
         elm_widget_item_del(it);
      }
 
@@ -1542,7 +1542,7 @@ _item_push(Eo *obj, void *_pd, va_list *list)
         prev_it->unfocusable = elm_widget_tree_unfocusable_get(VIEW(prev_it));
         elm_widget_tree_unfocusable_set(VIEW(prev_it), EINA_TRUE);
 
-        if (it->animator) ecore_animator_del(it->animator);
+        ecore_animator_del(it->animator);
         it->animator = ecore_animator_add(_push_transition_cb, it);
      }
    else
@@ -1738,7 +1738,7 @@ _item_pop(Eo *obj, void *_pd, va_list *list)
         edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
         edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
 
-        if (it->animator) ecore_animator_del(it->animator);
+        ecore_animator_del(it->animator);
         it->animator = ecore_animator_add(_pop_transition_cb, it);
         sd->popping = eina_list_append(sd->popping, it);
      }
@@ -1824,7 +1824,7 @@ elm_naviframe_item_promote(Elm_Object_Item *it)
 
    edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it)));
    edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit)));
-   if (nit->animator) ecore_animator_del(nit->animator);
+   ecore_animator_del(nit->animator);
    nit->animator = ecore_animator_add(_push_transition_cb, nit);
 }
 
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 7426417ca..8106f15e8 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -285,7 +285,7 @@ _drag_button_up_cb(void *data,
         sd->final_position = 0.5;
         evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)center);
 
-        if (sd->button_animator) ecore_animator_del(sd->button_animator);
+        ecore_animator_del(sd->button_animator);
         sd->button_animator = ecore_animator_add(_button_animator, obj);
 
         return;
@@ -344,7 +344,7 @@ _drag_button_up_cb(void *data,
         else
           sd->final_position = 0;
      }
-   if (sd->button_animator) ecore_animator_del(sd->button_animator);
+   ecore_animator_del(sd->button_animator);
    sd->button_animator = ecore_animator_add(_button_animator, obj);
 }
 
@@ -411,7 +411,7 @@ _track_move_cb(void *data,
              sd->final_position = 0.0;
           }
      }
-   if (sd->button_animator) ecore_animator_del(sd->button_animator);
+   ecore_animator_del(sd->button_animator);
    sd->button_animator = ecore_animator_add(_button_animator, obj);
 }
 
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index dbf6b85e7..f214a1fdc 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -788,7 +788,7 @@ elm_box_transition_free(void *data)
      (box_data->box, SIG_CHILD_ADDED, _transition_layout_child_added);
    evas_object_smart_callback_del
      (box_data->box, SIG_CHILD_REMOVED, _transition_layout_child_removed);
-   if (box_data->animator) ecore_animator_del(box_data->animator);
+   ecore_animator_del(box_data->animator);
 
    free(data);
 }
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 6724b5ffe..c177b764f 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -675,7 +675,7 @@ _button_month_inc_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = 1;
-   if (sd->spin_month) ecore_timer_del(sd->spin_month);
+   ecore_timer_del(sd->spin_month);
    sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data);
 
    _spin_month_value(data);
@@ -691,7 +691,7 @@ _button_month_dec_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = -1;
-   if (sd->spin_month) ecore_timer_del(sd->spin_month);
+   ecore_timer_del(sd->spin_month);
    sd->spin_month = ecore_timer_add(sd->interval, _spin_month_value, data);
 
    _spin_month_value(data);
@@ -719,7 +719,7 @@ _button_year_inc_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = 1;
-   if (sd->spin_year) ecore_timer_del(sd->spin_year);
+   ecore_timer_del(sd->spin_year);
    sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data);
 
    _spin_year_value(data);
@@ -735,7 +735,7 @@ _button_year_dec_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->spin_speed = -1;
-   if (sd->spin_year) ecore_timer_del(sd->spin_year);
+   ecore_timer_del(sd->spin_year);
    sd->spin_year = ecore_timer_add(sd->interval, _spin_year_value, data);
 
    _spin_year_value(data);
@@ -1030,9 +1030,9 @@ _elm_calendar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    Elm_Calendar_Mark *mark;
    Elm_Calendar_Smart_Data *sd = _pd;
 
-   if (sd->spin_month) ecore_timer_del(sd->spin_month);
-   if (sd->spin_year) ecore_timer_del(sd->spin_year);
-   if (sd->update_timer) ecore_timer_del(sd->update_timer);
+   ecore_timer_del(sd->spin_month);
+   ecore_timer_del(sd->spin_year);
+   ecore_timer_del(sd->update_timer);
 
    if (sd->marks)
      {
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index d7d6900c7..51b2b4fd8 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -145,7 +145,7 @@ _on_clock_val_up_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->sel_obj = obj;
-   if (sd->spin) ecore_timer_del(sd->spin);
+   ecore_timer_del(sd->spin);
    sd->spin = ecore_timer_add(sd->interval, _on_clock_val_up, data);
 
    _on_clock_val_up(data);
@@ -161,7 +161,7 @@ _on_clock_val_down_start(void *data,
 
    sd->interval = sd->first_interval;
    sd->sel_obj = obj;
-   if (sd->spin) ecore_timer_del(sd->spin);
+   ecore_timer_del(sd->spin);
    sd->spin = ecore_timer_add(sd->interval, _on_clock_val_down, data);
 
    _on_clock_val_down(data);
@@ -705,8 +705,8 @@ _elm_clock_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Clock_Smart_Data *sd = _pd;
 
-   if (sd->ticker) ecore_timer_del(sd->ticker);
-   if (sd->spin) ecore_timer_del(sd->spin);
+   ecore_timer_del(sd->ticker);
+   ecore_timer_del(sd->spin);
 
    /* NB: digits are killed for being sub objects, automatically */
 
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 9febad718..daca9fb83 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -4119,8 +4119,7 @@ _cont_obj_mouse_down(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *ev
    evas_object_event_callback_add(st->obj, EVAS_CALLBACK_MOUSE_UP,
          _cont_obj_mouse_up, st);
 
-   if (st->tm)
-     ecore_timer_del(st->tm);
+   ecore_timer_del(st->tm);
 
    st->e = e;
    st->x_down = ev->canvas.x;
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 4c3431fda..2c5cc20da 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1304,7 +1304,7 @@ _on_color_pressed(void *data,
    elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm");
    sd->longpressed = EINA_FALSE;
 
-   if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
+   ecore_timer_del(sd->longpress_timer);
    sd->longpress_timer = ecore_timer_add
        (_elm_config->longpress_timeout, _on_color_long_press, data);
 }
@@ -1586,7 +1586,7 @@ _elm_colorselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_CANVAS_FOCUS_IN, _mouse_in_canvas, obj);
    evas_event_callback_del_full(evas_object_evas_get(obj), EVAS_CALLBACK_CANVAS_FOCUS_OUT, _mouse_out_canvas, obj);
 
-   if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
+   ecore_timer_del(sd->longpress_timer);
    if (sd->palette_name) eina_stringshare_del(sd->palette_name);
 
 #ifdef HAVE_ELEMENTARY_X
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 344e3e1e5..222e04a0e 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -234,13 +234,13 @@ _prop_change(void *data  EINA_UNUSED,
      {
         if (event->atom == _atom[ATOM_E_PROFILE])
           {
-             if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer);
+             ecore_timer_del(_prop_change_delay_timer);
              _prop_change_delay_timer = ecore_timer_add(0.1, _prop_change_delay_cb, NULL);
           }
         else if (((_atom_config > 0) && (event->atom == _atom_config)) ||
                  (event->atom == _atom[ATOM_E_CONFIG]))
           {
-             if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer);
+             ecore_timer_del(_prop_change_delay_timer);
              _prop_change_delay_timer = ecore_timer_add(0.1, _prop_change_delay_cb, NULL);
           }
      }
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 317d3c458..d487db0c9 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -714,7 +714,7 @@ _on_content_resize(void *data,
        (sd->clipboard_state == ECORE_X_ILLUME_CLIPBOARD_STATE_OFF))
      return;
 
-   if (sd->show_region_job) ecore_job_del(sd->show_region_job);
+   ecore_job_del(sd->show_region_job);
    sd->show_region_job = ecore_job_add(_show_region_job, data);
 }
 
@@ -927,11 +927,11 @@ _elm_conformant_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    if (sd->prop_hdl) ecore_event_handler_del(sd->prop_hdl);
 #endif
 
-   if (sd->show_region_job) ecore_job_del(sd->show_region_job);
-   if (sd->port_indi_timer) ecore_timer_del(sd->port_indi_timer);
-   if (sd->land_indi_timer) ecore_timer_del(sd->land_indi_timer);
-   if (sd->portrait_indicator) evas_object_del(sd->portrait_indicator);
-   if (sd->landscape_indicator) evas_object_del(sd->landscape_indicator);
+   ecore_job_del(sd->show_region_job);
+   ecore_timer_del(sd->port_indi_timer);
+   ecore_timer_del(sd->land_indi_timer);
+   evas_object_del(sd->portrait_indicator);
+   evas_object_del(sd->landscape_indicator);
 
    top = elm_widget_top_get(obj);
    evas_object_data_set(top, "\377 elm,conformant", NULL);
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 51d321fd3..7fa3b135f 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -832,8 +832,7 @@ _elm_entry_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
           }
         else
           {
-             if (sd->deferred_recalc_job)
-               ecore_job_del(sd->deferred_recalc_job);
+             ecore_job_del(sd->deferred_recalc_job);
              sd->deferred_recalc_job =
                ecore_job_add(_deferred_recalc_job, obj);
           }
@@ -1080,7 +1079,7 @@ _hover_dismissed_cb(void *data,
           }
      }
    elm_widget_scroll_freeze_pop(data);
-   if (sd->hov_deljob) ecore_job_del(sd->hov_deljob);
+   ecore_job_del(sd->hov_deljob);
    sd->hov_deljob = ecore_job_add(_hover_del_job, data);
 }
 
@@ -3392,27 +3391,24 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    evas_event_freeze(evas_object_evas_get(obj));
 
-   if (sd->file) eina_stringshare_del(sd->file);
+   eina_stringshare_del(sd->file);
 
-   if (sd->hov_deljob) ecore_job_del(sd->hov_deljob);
+   ecore_job_del(sd->hov_deljob);
    if ((sd->api) && (sd->api->obj_unhook))
      sd->api->obj_unhook(obj);  // module - unhook
 
-   if (sd->mgf_proxy) evas_object_del(sd->mgf_proxy);
-   if (sd->mgf_bg) evas_object_del(sd->mgf_bg);
-   if (sd->mgf_clip) evas_object_del(sd->mgf_clip);
+   evas_object_del(sd->mgf_proxy);
+   evas_object_del(sd->mgf_bg);
+   evas_object_del(sd->mgf_clip);
 
    entries = eina_list_remove(entries, obj);
 #ifdef HAVE_ELEMENTARY_X
-   if (sd->sel_notify_handler)
-     ecore_event_handler_del(sd->sel_notify_handler);
-   if (sd->sel_clear_handler)
-     ecore_event_handler_del(sd->sel_clear_handler);
+   ecore_event_handler_del(sd->sel_notify_handler);
+   ecore_event_handler_del(sd->sel_clear_handler);
 #endif
-   if (sd->cut_sel) eina_stringshare_del(sd->cut_sel);
-   if (sd->text) eina_stringshare_del(sd->text);
-   if (sd->deferred_recalc_job)
-     ecore_job_del(sd->deferred_recalc_job);
+   eina_stringshare_del(sd->cut_sel);
+   eina_stringshare_del(sd->text);
+   ecore_job_del(sd->deferred_recalc_job);
    if (sd->append_text_idler)
      {
         ecore_idler_del(sd->append_text_idler);
@@ -3420,7 +3416,7 @@ _elm_entry_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
         sd->append_text_left = NULL;
         sd->append_text_idler = NULL;
      }
-   if (sd->longpress_timer) ecore_timer_del(sd->longpress_timer);
+   ecore_timer_del(sd->longpress_timer);
    EINA_LIST_FREE(sd->items, it)
      {
         eina_stringshare_del(it->label);
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 45eb2b087..f1087374c 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1650,7 +1650,7 @@ _up_cb(void *data,
    if (!sd->finish) tm = 1.0 - tm;
    else sd->next_state = !sd->state;
    tm *= 1.0; // FIXME: config for anim time
-   if (sd->animator) ecore_animator_del(sd->animator);
+   ecore_animator_del(sd->animator);
    sd->animator = ecore_animator_timeline_add(tm, _event_anim, sd);
    sd->len = tm;
    sd->start = ecore_loop_time_get();
@@ -1731,7 +1731,7 @@ _move_cb(void *data,
      }
 
    ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-   if (sd->job) ecore_job_del(sd->job);
+   ecore_job_del(sd->job);
    sd->job = ecore_job_add(_update_job, fl);
 }
 
@@ -1889,7 +1889,7 @@ _elm_flip_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Flip_Smart_Data *sd = _pd;
 
-   if (sd->animator) ecore_animator_del(sd->animator);
+   ecore_animator_del(sd->animator);
    _state_slices_clear(sd);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index fead756d5..9bb8803da 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -497,7 +497,7 @@ _signal_val_up_start(void *data,
 
    sd->interval = sd->first_interval;
 
-   if (sd->spin) ecore_timer_del(sd->spin);
+   ecore_timer_del(sd->spin);
    sd->spin = ecore_timer_add(sd->interval, _signal_val_up, data);
 
    _signal_val_up(data);
@@ -530,7 +530,7 @@ _signal_val_down_start(void *data,
 
    sd->interval = sd->first_interval;
 
-   if (sd->spin) ecore_timer_del(sd->spin);
+   ecore_timer_del(sd->spin);
    sd->spin = ecore_timer_add(sd->interval, _signal_val_down, data);
 
    _signal_val_down(data);
@@ -587,7 +587,7 @@ _elm_flipselector_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    while (sd->items)
      elm_widget_item_del(DATA_GET(sd->items));
 
-   if (sd->spin) ecore_timer_del(sd->spin);
+   ecore_timer_del(sd->spin);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index e2a242983..6665c9741 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -267,7 +267,7 @@ _elm_gengrid_pan_smart_move(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    va_arg(*list, Evas_Coord);
    va_arg(*list, Evas_Coord);
 
-   if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job);
+   ecore_job_del(psd->wsd->calc_job);
    psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
 }
 
@@ -282,7 +282,7 @@ _elm_gengrid_pan_smart_resize(Eo *obj, void *_pd, va_list *list)
 
    evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
    if ((ow == w) && (oh == h)) return;
-   if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job);
+   ecore_job_del(psd->wsd->calc_job);
    psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
 }
 
@@ -359,7 +359,7 @@ _item_mouse_move_cb(void *data,
                sd->reorder_item_y = oy + oh - sd->item_height;
              else sd->reorder_item_y = it_scrl_y;
 
-             if (sd->calc_job) ecore_job_del(sd->calc_job);
+             ecore_job_del(sd->calc_job);
              sd->calc_job = ecore_job_add(_calc_job, sd->obj);
           }
         return;
@@ -594,8 +594,7 @@ _item_mouse_up_cb(void *data,
           (WIDGET(it), SIG_MOVED, sd->reorder_it);
         sd->reorder_it = NULL;
         sd->move_effect_enabled = EINA_FALSE;
-        if (sd->calc_job)
-          ecore_job_del(sd->calc_job);
+        ecore_job_del(sd->calc_job);
         sd->calc_job =
           ecore_job_add(_calc_job, sd->obj);
 
@@ -1243,8 +1242,7 @@ _item_place(Elm_Gen_Item *it,
 
                             wsd->reorder_item_changed = EINA_TRUE;
                             wsd->move_effect_enabled = EINA_TRUE;
-                            if (wsd->calc_job)
-                              ecore_job_del(wsd->calc_job);
+                            ecore_job_del(wsd->calc_job);
                             wsd->calc_job =
                               ecore_job_add(_calc_job, wsd->obj);
 
@@ -2058,7 +2056,7 @@ _elm_gengrid_item_del_serious(Elm_Gen_Item *it)
      sd->group_items = eina_list_remove(sd->group_items, it);
 
    ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free);
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(sd->calc_cb, sd->obj);
 
    if (sd->last_selected_item == (Elm_Object_Item *)it)
@@ -2451,7 +2449,7 @@ _elm_gengrid_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
    ELM_SAFE_FREE(sd->stack, evas_object_del);
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
@@ -2555,7 +2553,7 @@ _item_size_set(Eo *obj, void *_pd, va_list *list)
    if ((sd->item_width == w) && (sd->item_height == h)) return;
    sd->item_width = w;
    sd->item_height = h;
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 }
 
@@ -2598,7 +2596,7 @@ _group_item_size_set(Eo *obj, void *_pd, va_list *list)
    if ((sd->group_item_width == w) && (sd->group_item_height == h)) return;
    sd->group_item_width = w;
    sd->group_item_height = h;
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 }
 
@@ -2715,7 +2713,7 @@ _item_append(Eo *obj, void *_pd, va_list *list)
    if (it->group)
      sd->group_items = eina_list_prepend(sd->group_items, it);
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 
    *ret = (Elm_Object_Item *)it;
@@ -2756,7 +2754,7 @@ _item_prepend(Eo *obj, void *_pd, va_list *list)
    if (it->group)
      sd->group_items = eina_list_append(sd->group_items, it);
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 
    *ret = (Elm_Object_Item *)it;
@@ -2804,7 +2802,7 @@ _item_insert_before(Eo *obj, void *_pd, va_list *list)
      sd->group_items = eina_list_append_relative
          (sd->group_items, it, ((Elm_Gen_Item *)relative)->parent);
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 
    *ret = (Elm_Object_Item *)it;
@@ -2852,7 +2850,7 @@ _item_insert_after(Eo *obj, void *_pd, va_list *list)
      sd->group_items = eina_list_prepend_relative
          (sd->group_items, it, ((Elm_Gen_Item *)relative)->parent);
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 
    *ret = (Elm_Object_Item *)it;
@@ -2900,7 +2898,7 @@ _item_sorted_insert(Eo *obj, void *_pd, va_list *list)
        (sd->items, EINA_INLIST_GET(it), _elm_gengrid_item_compare, sd->state);
    _item_position_update(sd->items, 0);
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 
    *ret = (Elm_Object_Item *)it;
@@ -2925,7 +2923,7 @@ _horizontal_set(Eo *obj, void *_pd, va_list *list)
    sd->horizontal = horizontal;
 
    /* Update the items to conform to the new layout */
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
 }
 
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index baaa95dfa..8b7cf6ada 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -199,8 +199,7 @@ _elm_genlist_pan_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Genlist_Pan_Smart_Data *psd = _pd;
 
-   if (psd->resize_job)
-     ecore_job_del(psd->resize_job);
+   ecore_job_del(psd->resize_job);
 
    eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_del());
 }
@@ -240,13 +239,13 @@ _elm_genlist_pan_smart_resize(Eo *obj, void *_pd, va_list *list)
    if ((psd->wsd->mode == ELM_LIST_COMPRESS) && (ow != w))
      {
         /* fix me later */
-        if (psd->resize_job) ecore_job_del(psd->resize_job);
+        ecore_job_del(psd->resize_job);
         psd->resize_job =
           ecore_job_add(_elm_genlist_pan_smart_resize_job, obj);
      }
    psd->wsd->pan_changed = EINA_TRUE;
    evas_object_smart_changed(obj);
-   if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job);
+   ecore_job_del(psd->wsd->calc_job);
    // if the width changed we may have to resize content if scrollbar went
    // away or appeared to queue a job to deal with it. it should settle in
    // the end to a steady-state
@@ -396,7 +395,7 @@ _must_recalc_idler(void *data)
 {
    ELM_GENLIST_DATA_GET(data, sd);
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, data);
    sd->must_recalc_idler = NULL;
    return ECORE_CALLBACK_CANCEL;
@@ -588,7 +587,7 @@ _elm_genlist_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
                {
                   itb->must_recalc = EINA_TRUE;
                }
-             if (sd->calc_job) ecore_job_del(sd->calc_job);
+             ecore_job_del(sd->calc_job);
              sd->calc_job = ecore_job_add(_calc_job, obj);
           }
         minw = vmw;
@@ -2193,7 +2192,7 @@ _elm_genlist_pan_smart_calculate(Eo *obj EINA_UNUSED, void *_pd, va_list *list E
 
    if (psd->wsd->pan_changed)
      {
-        if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job);
+        ecore_job_del(psd->wsd->calc_job);
         psd->wsd->calc_job = NULL;
         _calc_job(psd->wsd->obj);
         psd->wsd->pan_changed = EINA_FALSE;
@@ -2801,7 +2800,7 @@ _elm_genlist_smart_theme(Eo *obj, void *_pd, va_list *list)
 
         itb->changed = EINA_TRUE;
      }
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, obj);
    elm_layout_sizing_eval(obj);
    evas_event_thaw(evas_object_evas_get(obj));
@@ -2951,7 +2950,7 @@ _item_block_del(Elm_Gen_Item *it)
    itb->items = eina_list_remove(itb->items, it);
    itb->count--;
    itb->changed = EINA_TRUE;
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, sd->obj);
    if (itb->count < 1)
      {
@@ -3016,7 +3015,7 @@ _item_block_del(Elm_Gen_Item *it)
      {
         sd->pan_changed = EINA_TRUE;
         evas_object_smart_changed(sd->pan_obj);
-        if (sd->calc_job) ecore_job_del(sd->calc_job);
+        ecore_job_del(sd->calc_job);
         sd->calc_job = NULL;
      }
 }
@@ -3091,7 +3090,7 @@ _elm_genlist_item_del_serious(Elm_Gen_Item *it)
      sd->group_items = eina_list_remove(sd->group_items, it);
 
    ELM_SAFE_FREE(sd->state, eina_inlist_sorted_state_free);
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, sd->obj);
 
    if (sd->last_selected_item == (Elm_Object_Item *)it)
@@ -3251,7 +3250,7 @@ _item_mouse_move_cb(void *data,
              else
                _item_position(it, VIEW(it), it->item->scrl_x, y_pos);
 
-             if (sd->calc_job) ecore_job_del(sd->calc_job);
+             ecore_job_del(sd->calc_job);
              sd->calc_job = ecore_job_add(_calc_job, sd->obj);
           }
         return;
@@ -3577,7 +3576,7 @@ _item_mouse_down_cb(void *data,
         sd->prev_x = ev->canvas.x;
         sd->prev_y = ev->canvas.y;
         sd->multi_timeout = EINA_FALSE;
-        if (sd->multi_timer) ecore_timer_del(sd->multi_timer);
+        ecore_timer_del(sd->multi_timer);
         sd->multi_timer = ecore_timer_add(MULTI_DOWN_TIME, _multi_cancel, sd->obj);
      }
    sd->longpressed = EINA_FALSE;
@@ -3594,7 +3593,7 @@ _item_mouse_down_cb(void *data,
           evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
        }
    evas_object_smart_callback_call(WIDGET(it), SIG_PRESSED, it);
-   if (it->item->swipe_timer) ecore_timer_del(it->item->swipe_timer);
+   ecore_timer_del(it->item->swipe_timer);
    it->item->swipe_timer = ecore_timer_add(SWIPE_TIME, _swipe_cancel, it);
    ELM_SAFE_FREE(it->long_timer, ecore_timer_del);
    if (it->realized)
@@ -3803,7 +3802,7 @@ newblock:
    itb->count++;
    itb->changed = EINA_TRUE;
    it->item->block = itb;
-   if (itb->sd->calc_job) ecore_job_del(itb->sd->calc_job);
+   ecore_job_del(itb->sd->calc_job);
    itb->sd->calc_job = ecore_job_add(_calc_job, itb->sd->obj);
 
    if (itb->count > itb->sd->max_items_per_block)
@@ -4002,7 +4001,7 @@ _item_idle_enterer(void *data)
    if (wakeup)
      {
         // wake up mainloop
-        if (sd->calc_job) ecore_job_del(sd->calc_job);
+        ecore_job_del(sd->calc_job);
         sd->calc_job = ecore_job_add(_calc_job, data);
      }
    if (ok == ECORE_CALLBACK_CANCEL) sd->queue_idle_enterer = NULL;
@@ -4216,7 +4215,7 @@ _item_mouse_up_cb(void *data,
           }
         else
           {
-             if (sd->calc_job) ecore_job_del(sd->calc_job);
+             ecore_job_del(sd->calc_job);
              sd->calc_job = ecore_job_add(_calc_job, sd->obj);
           }
         edje_object_signal_emit(VIEW(it), "elm,state,reorder,disabled", "elm");
@@ -4664,7 +4663,7 @@ _update_job(void *data)
      }
    if (position)
      {
-        if (sd->calc_job) ecore_job_del(sd->calc_job);
+        ecore_job_del(sd->calc_job);
         sd->calc_job = ecore_job_add(_calc_job, sd->obj);
      }
    evas_event_thaw(evas_object_evas_get(sd->obj));
@@ -4997,14 +4996,14 @@ _elm_genlist_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    ELM_SAFE_FREE(sd->pan_obj, evas_object_del);
 
    _item_cache_zero(sd);
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
-   if (sd->update_job) ecore_job_del(sd->update_job);
-   if (sd->queue_idle_enterer) ecore_idle_enterer_del(sd->queue_idle_enterer);
-   if (sd->must_recalc_idler) ecore_idler_del(sd->must_recalc_idler);
-   if (sd->multi_timer) ecore_timer_del(sd->multi_timer);
-   if (sd->scr_hold_timer) ecore_timer_del(sd->scr_hold_timer);
-   if (sd->decorate_it_type) eina_stringshare_del(sd->decorate_it_type);
-   if (sd->tree_effect_animator) ecore_animator_del(sd->tree_effect_animator);
+   ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->update_job);
+   ecore_idle_enterer_del(sd->queue_idle_enterer);
+   ecore_idler_del(sd->must_recalc_idler);
+   ecore_timer_del(sd->multi_timer);
+   ecore_timer_del(sd->scr_hold_timer);
+   eina_stringshare_del(sd->decorate_it_type);
+   ecore_animator_del(sd->tree_effect_animator);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
@@ -5323,7 +5322,7 @@ _item_del_pre_hook(Elm_Object_Item *item)
           {
              if (it->realized) _elm_genlist_item_unrealize(it, EINA_FALSE);
              it->item->block->changed = EINA_TRUE;
-             if (sd->calc_job) ecore_job_del(sd->calc_job);
+             ecore_job_del(sd->calc_job);
              sd->calc_job = ecore_job_add(_calc_job, sd->obj);
           }
         if (it->parent)
@@ -6481,7 +6480,7 @@ elm_genlist_item_update(Elm_Object_Item *item)
    it->item->mincalcd = EINA_FALSE;
    it->item->updateme = EINA_TRUE;
    it->item->block->updateme = EINA_TRUE;
-   if (sd->update_job) ecore_job_del(sd->update_job);
+   ecore_job_del(sd->update_job);
    sd->update_job = ecore_job_add(_update_job, sd->obj);
 }
 
@@ -7213,7 +7212,7 @@ _decorate_mode_set(Eo *obj, void *_pd, va_list *valist)
           }
      }
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, sd->obj);
 }
 
@@ -7345,7 +7344,7 @@ _flip_job(void *data)
 
    it->flipped = EINA_TRUE;
    it->item->nocache = EINA_TRUE;
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job, sd->obj);
 }
 
@@ -7477,7 +7476,7 @@ elm_genlist_item_select_mode_set(Elm_Object_Item *item,
         it->item->mincalcd = EINA_FALSE;
         it->item->updateme = EINA_TRUE;
         if (it->item->block) it->item->block->updateme = EINA_TRUE;
-        if (sd->update_job) ecore_job_del(sd->update_job);
+        ecore_job_del(sd->update_job);
         sd->update_job = ecore_job_add(_update_job, sd->obj);
 
         // reset homogeneous item size
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 63bbb0628..78fe6004b 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -3799,7 +3799,7 @@ _elm_gesture_layer_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
           free(sd->gesture[i]);
           sd->gesture[i] = NULL; /* Referenced by _event_history_clear */
        }
-   if (sd->gest_taps_timeout) ecore_timer_del(sd->gest_taps_timeout);
+   ecore_timer_del(sd->gest_taps_timeout);
 
    /* Then take care of clearing events */
    _event_history_clear(obj);
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 3a3c4ebb0..c669ea2be 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -493,9 +493,9 @@ _elm_image_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Image_Smart_Data *sd = _pd;
 
-   if (sd->anim_timer) ecore_timer_del(sd->anim_timer);
-   if (sd->img) evas_object_del(sd->img);
-   if (sd->prev_img) evas_object_del(sd->prev_img);
+   ecore_timer_del(sd->anim_timer);
+   evas_object_del(sd->img);
+   evas_object_del(sd->prev_img);
    if (sd->remote) elm_url_cancel(sd->remote);
    free(sd->remote_data);
    eina_stringshare_del(sd->key);
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 14a32f389..eaaa51030 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -643,7 +643,7 @@ _sel_eval(Evas_Object *obj,
                   else
                     evas_object_smart_callback_call
                        (obj, SIG_CHANGED, it);
-                  if (sd->delay) ecore_timer_del(sd->delay);
+                  ecore_timer_del(sd->delay);
                   sd->delay = ecore_timer_add(sd->delay_change_time,
                                               _delay_change_cb, obj);
                }
@@ -975,7 +975,7 @@ _elm_index_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    EINA_LIST_FREE(sd->omit, o)
      free(o);
 
-   if (sd->delay) ecore_timer_del(sd->delay);
+   ecore_timer_del(sd->delay);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
@@ -1230,7 +1230,7 @@ elm_index_item_selected_set(Elm_Object_Item *it,
            (obj, SIG_CHANGED, it);
         evas_object_smart_callback_call
            (obj, SIG_SELECTED, it);
-        if (sd->delay) ecore_timer_del(sd->delay);
+        ecore_timer_del(sd->delay);
         sd->delay = ecore_timer_add(sd->delay_change_time,
                                     _delay_change_cb, obj);
      }
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 2da13af34..046ad63d3 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -4643,14 +4643,14 @@ _elm_scroll_interface_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    eo_do(obj, elm_scrollable_interface_content_set(NULL));
    if (!sid->extern_pan) evas_object_del(sid->pan_obj);
 
-   if (sid->down.hold_enterer) ecore_idle_enterer_del(sid->down.hold_enterer);
-   if (sid->down.hold_animator) ecore_animator_del(sid->down.hold_animator);
-   if (sid->down.onhold_animator) ecore_animator_del(sid->down.onhold_animator);
-   if (sid->down.momentum_animator) ecore_animator_del(sid->down.momentum_animator);
-   if (sid->down.bounce_x_animator) ecore_animator_del(sid->down.bounce_x_animator);
-   if (sid->down.bounce_y_animator) ecore_animator_del(sid->down.bounce_y_animator);
-   if (sid->scrollto.x.animator) ecore_animator_del(sid->scrollto.x.animator);
-   if (sid->scrollto.y.animator) ecore_animator_del(sid->scrollto.y.animator);
+   ecore_idle_enterer_del(sid->down.hold_enterer);
+   ecore_animator_del(sid->down.hold_animator);
+   ecore_animator_del(sid->down.onhold_animator);
+   ecore_animator_del(sid->down.momentum_animator);
+   ecore_animator_del(sid->down.bounce_x_animator);
+   ecore_animator_del(sid->down.bounce_y_animator);
+   ecore_animator_del(sid->scrollto.x.animator);
+   ecore_animator_del(sid->scrollto.y.animator);
 }
 
 static void
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 4772233a8..8ca8825c3 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1235,10 +1235,10 @@ _mouse_down_cb(void *data,
 
    _item_highlight(it);
    sd->longpressed = EINA_FALSE;
-   if (it->long_timer) ecore_timer_del(it->long_timer);
+   ecore_timer_del(it->long_timer);
    it->long_timer = ecore_timer_add
        (_elm_config->longpress_timeout, _long_press_cb, it);
-   if (it->swipe_timer) ecore_timer_del(it->swipe_timer);
+   ecore_timer_del(it->swipe_timer);
    it->swipe_timer = ecore_timer_add(0.4, _swipe_cancel, it);
 
    /* Always call the callbacks last - the user may delete our context! */
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 690e1448a..4064f0a3a 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -627,7 +627,7 @@ _grid_item_update(Grid_Item *gi)
         gi->file_have = EINA_TRUE;
      }
 
-   if (gi->wsd->loaded_timer) ecore_timer_del(gi->wsd->loaded_timer);
+   ecore_timer_del(gi->wsd->loaded_timer);
    gi->wsd->loaded_timer = ecore_timer_add(0.25, _loaded_timeout_cb, gi->wsd->obj);
 }
 
@@ -1161,7 +1161,7 @@ _zoom_with_animation(Elm_Map_Smart_Data *sd,
    sd->ani.cnt = cnt;
    sd->ani.zoom = sd->zoom;
    sd->ani.diff = (double)(zoom - sd->zoom) / cnt;
-   if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator);
+   ecore_animator_del(sd->zoom_animator);
    sd->zoom_animator = ecore_animator_add(_zoom_anim_cb, sd->obj);
 }
 
@@ -1262,7 +1262,7 @@ _mouse_down_cb(void *data,
      evas_object_smart_callback_call
        (sd->obj, SIG_PRESS, ev);
 
-   if (sd->long_timer) ecore_timer_del(sd->long_timer);
+   ecore_timer_del(sd->long_timer);
    sd->ev = *ev;
    sd->long_timer =
      ecore_timer_add(_elm_config->longpress_timeout, _long_press_cb, data);
@@ -4081,12 +4081,12 @@ _elm_map_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    EINA_LIST_FREE(sd->track, track)
      evas_object_del(track);
 
-   if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
-   if (sd->long_timer) ecore_timer_del(sd->long_timer);
-   if (sd->user_agent) eina_stringshare_del(sd->user_agent);
-   if (sd->ua) eina_hash_free(sd->ua);
-   if (sd->zoom_timer) ecore_timer_del(sd->zoom_timer);
-   if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator);
+   ecore_timer_del(sd->scr_timer);
+   ecore_timer_del(sd->long_timer);
+   eina_stringshare_del(sd->user_agent);
+   eina_hash_free(sd->ua);
+   ecore_timer_del(sd->zoom_timer);
+   ecore_animator_del(sd->zoom_animator);
 
    _grid_all_clear(sd);
    // Removal of download list should be after grid clear.
@@ -4103,7 +4103,7 @@ _elm_map_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
         ERR("Deletion of %s failed", buf);
    }
 
-   if (sd->loaded_timer) ecore_timer_del(sd->loaded_timer);
+   ecore_timer_del(sd->loaded_timer);
    if (sd->map) evas_map_free(sd->map);
 
    eo_unref(sd->pan_obj);
@@ -4426,7 +4426,7 @@ _paused_set(Eo *obj, void *_pd, va_list *list)
      {
         if (sd->zoom_animator)
           {
-             if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator);
+             ecore_animator_del(sd->zoom_animator);
              sd->zoom_animator = NULL;
              _zoom_do(sd, sd->zoom);
           }
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 86c6b5ebc..def1d6c4d 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -270,7 +270,7 @@ static void
 _timer_init(Evas_Object *obj,
             Elm_Notify_Smart_Data *sd)
 {
-   if (sd->timer) ecore_timer_del(sd->timer);
+   ecore_timer_del(sd->timer);
    if (sd->timeout > 0.0)
      sd->timer = ecore_timer_add(sd->timeout, _timer_cb, obj);
    else
@@ -502,7 +502,7 @@ _elm_notify_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
       (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj);
    elm_notify_parent_set(obj, NULL);
    elm_notify_allow_events_set(obj, EINA_FALSE);
-   if (sd->timer) ecore_timer_del(sd->timer);
+   ecore_timer_del(sd->timer);
 
    ELM_SAFE_FREE(sd->notify, evas_object_del);
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index b340bd111..c6e590d4c 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -195,7 +195,7 @@ _mouse_down(void *data,
 
    if (ev->button != 1) return;
 
-   if (sd->long_press_timer) ecore_timer_del(sd->long_press_timer);
+   ecore_timer_del(sd->long_press_timer);
    sd->long_press_timer = ecore_timer_add(_elm_config->longpress_timeout,
                                           _long_press_cb, data);
    evas_object_event_callback_add
@@ -303,7 +303,7 @@ _elm_photo_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Photo_Smart_Data * sd = _pd;
 
-   if (sd->long_press_timer) ecore_timer_del(sd->long_press_timer);
+   ecore_timer_del(sd->long_press_timer);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index ce192f3f6..bde52adb1 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -136,7 +136,7 @@ _elm_photocam_pan_smart_move(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    va_arg(*list, Evas_Coord);
    va_arg(*list, Evas_Coord);
 
-   if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job);
+   ecore_job_del(psd->wsd->calc_job);
    psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
 }
 
@@ -153,7 +153,7 @@ _elm_photocam_pan_smart_resize(Eo *obj, void *_pd, va_list *list)
    if ((ow == w) && (oh == h)) return;
 
    psd->wsd->resized = EINA_TRUE;
-   if (psd->wsd->calc_job) ecore_job_del(psd->wsd->calc_job);
+   ecore_job_del(psd->wsd->calc_job);
    psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
 }
 
@@ -734,7 +734,7 @@ _main_img_preloaded_cb(void *data,
         sd->grids = eina_list_prepend(sd->grids, g);
         _grid_load(obj, g);
      }
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job_cb, data);
    evas_object_smart_callback_call(data, SIG_LOADED, NULL);
    sd->preload_num--;
@@ -772,7 +772,7 @@ _zoom_do(Evas_Object *obj,
    sd->show.w = ow;
    sd->show.h = oh;
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job_cb, obj);
    if (t >= 1.0)
      {
@@ -854,7 +854,7 @@ _mouse_down_cb(void *data,
    else
      evas_object_smart_callback_call(data, SIG_PRESS, NULL);
    sd->longpressed = EINA_FALSE;
-   if (sd->long_timer) ecore_timer_del(sd->long_timer);
+   ecore_timer_del(sd->long_timer);
    sd->long_timer = ecore_timer_add
        (_elm_config->longpress_timeout, _long_press_cb, data);
 }
@@ -959,7 +959,7 @@ _scroll_cb(Evas_Object *obj,
         if (sd->no_smooth == 1) _smooth_update(obj);
      }
 
-   if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
+   ecore_timer_del(sd->scr_timer);
    sd->scr_timer = ecore_timer_add(0.5, _scroll_timeout_cb, obj);
 
    evas_object_smart_callback_call(obj, SIG_SCROLL, NULL);
@@ -1414,13 +1414,12 @@ _elm_photocam_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    if (sd->f) eina_file_close(sd->f);
    free(sd->remote_data);
    if (sd->remote) elm_url_cancel(sd->remote);
-   if (sd->file) eina_stringshare_del(sd->file);
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
-   if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
-   if (sd->long_timer) ecore_timer_del(sd->long_timer);
-   if (sd->zoom_animator) ecore_animator_del(sd->zoom_animator);
-   if (sd->g_layer_zoom.bounce.animator)
-     ecore_animator_del(sd->g_layer_zoom.bounce.animator);
+   eina_stringshare_del(sd->file);
+   ecore_job_del(sd->calc_job);
+   ecore_timer_del(sd->scr_timer);
+   ecore_timer_del(sd->long_timer);
+   ecore_animator_del(sd->zoom_animator);
+   ecore_animator_del(sd->g_layer_zoom.bounce.animator);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
@@ -1629,7 +1628,7 @@ _file_set(Eo *obj, void *_pd, va_list *list)
         ecore_animator_del(sd->zoom_animator);
         sd->zoom_animator = NULL;
      }
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    evas_object_hide(sd->img);
    if (sd->f) eina_file_close(sd->f);
    sd->f = NULL;
@@ -1895,7 +1894,7 @@ done:
           }
      }
 
-   if (sd->calc_job) ecore_job_del(sd->calc_job);
+   ecore_job_del(sd->calc_job);
    sd->calc_job = ecore_job_add(_calc_job_cb, obj);
    if (!sd->paused)
      {
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 4d567517b..f529e5814 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -84,7 +84,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
         if (user_event)
           {
              evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
-             if (sd->delay) ecore_timer_del(sd->delay);
+             ecore_timer_del(sd->delay);
              sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
           }
      }
@@ -905,10 +905,10 @@ _elm_slider_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Slider_Smart_Data *sd = _pd;
 
-   if (sd->indicator) eina_stringshare_del(sd->indicator);
-   if (sd->units) eina_stringshare_del(sd->units);
-   if (sd->delay) ecore_timer_del(sd->delay);
-   if (sd->popup) evas_object_del(sd->popup);
+   eina_stringshare_del(sd->indicator);
+   eina_stringshare_del(sd->units);
+   ecore_timer_del(sd->delay);
+   evas_object_del(sd->popup);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 2220f974c..dcdf5f557 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -356,7 +356,7 @@ _elm_slideshow_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    elm_slideshow_clear(obj);
    if (sd->transitions) elm_widget_stringlist_free(sd->transitions);
-   if (sd->timer) ecore_timer_del(sd->timer);
+   ecore_timer_del(sd->timer);
 
    EINA_LIST_FREE(sd->layout.list, layout)
      eina_stringshare_del(layout);
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 9fb3c7ebb..50cde2327 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -153,7 +153,7 @@ _value_set(Evas_Object *obj,
    sd->val = new_val;
 
    evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
-   if (sd->delay_timer) ecore_timer_del(sd->delay_timer);
+   ecore_timer_del(sd->delay_timer);
    sd->delay_timer = ecore_timer_add(0.2, _delay_change, obj);
 
    return EINA_TRUE;
@@ -266,7 +266,7 @@ _entry_activated_cb(void *data,
 
    _entry_value_apply(data);
    evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
-   if (sd->delay_timer) ecore_timer_del(sd->delay_timer);
+   ecore_timer_del(sd->delay_timer);
    sd->delay_timer = ecore_timer_add(0.2, _delay_change, data);
 }
 
@@ -335,7 +335,7 @@ _val_inc_start(Evas_Object *obj)
 
    sd->interval = sd->first_interval;
    sd->spin_speed = sd->step;
-   if (sd->spin_timer) ecore_timer_del(sd->spin_timer);
+   ecore_timer_del(sd->spin_timer);
    sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, obj);
    _spin_value(obj);
 }
@@ -357,7 +357,7 @@ _val_dec_start(Evas_Object *obj)
 
    sd->interval = sd->first_interval;
    sd->spin_speed = -sd->step;
-   if (sd->spin_timer) ecore_timer_del(sd->spin_timer);
+   ecore_timer_del(sd->spin_timer);
    sd->spin_timer = ecore_timer_add(sd->interval, _spin_value, obj);
    _spin_value(obj);
 }
@@ -739,9 +739,9 @@ _elm_spinner_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    Elm_Spinner_Smart_Data *sd = _pd;
 
-   if (sd->label) eina_stringshare_del(sd->label);
-   if (sd->delay_timer) ecore_timer_del(sd->delay_timer);
-   if (sd->spin_timer) ecore_timer_del(sd->spin_timer);
+   eina_stringshare_del(sd->label);
+   ecore_timer_del(sd->delay_timer);
+   ecore_timer_del(sd->spin_timer);
 
    if (sd->special_values)
      {
diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index 2fbc0f9f3..c96049b74 100644
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -232,7 +232,7 @@ _store_genlist_item_realized(void *data, Evas_Object *obj EINA_UNUSED, void *eve
    if (!sti) return;
    st->realized_count++;
    sti->live = EINA_TRUE;
-   if (sti->eval_job) ecore_job_del(sti->eval_job);
+   ecore_job_del(sti->eval_job);
    sti->eval_job = ecore_job_add(_store_item_eval, sti);
 }
 
@@ -245,7 +245,7 @@ _store_genlist_item_unrealized(void *data, Evas_Object *obj EINA_UNUSED, void *e
    if (!sti) return;
    st->realized_count--;
    sti->live = EINA_FALSE;
-   if (sti->eval_job) ecore_job_del(sti->eval_job);
+   ecore_job_del(sti->eval_job);
    sti->eval_job = ecore_job_add(_store_item_eval, sti);
 }
 
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 4cd9e6efb..8c37d3bbd 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -737,7 +737,7 @@ _resize_cb(void *data,
    evas_object_geometry_get(data, &x, &y, NULL, &h);
    evas_object_move(sd->more, x, y + h);
 
-   if (sd->resize_job) ecore_job_del(sd->resize_job);
+   ecore_job_del(sd->resize_job);
    sd->resize_job = ecore_job_add(_resize_job, data);
 }
 
@@ -2586,9 +2586,7 @@ _elm_toolbar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    sd->delete_me = EINA_TRUE;
 
-   if (sd->resize_job)
-     ecore_job_del(sd->resize_job);
-
+   ecore_job_del(sd->resize_job);
    sd->resize_job = NULL;
 
    it = ELM_TOOLBAR_ITEM_FROM_INLIST(sd->items);
@@ -2599,7 +2597,7 @@ _elm_toolbar_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
         it = next;
      }
    if (sd->more_item) elm_widget_item_del(sd->more_item);
-   if (sd->long_timer) ecore_timer_del(sd->long_timer);
+   ecore_timer_del(sd->long_timer);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 74df5e087..491e3e5ab 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -254,7 +254,7 @@ _elm_video_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 {
    Elm_Video_Smart_Data *sd = _pd;
 
-   if (sd->timer) ecore_timer_del(sd->timer);
+   ecore_timer_del(sd->timer);
    if (sd->remember) emotion_object_last_position_save(sd->emotion);
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index 53087b028..4ff13a10b 100644
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -259,7 +259,7 @@ _view_smart_del(Evas_Object *obj)
 
    sd = evas_object_smart_data_get(obj);
 
-   if (sd->mouse.pan_anim) ecore_animator_del(sd->mouse.pan_anim);
+   ecore_animator_del(sd->mouse.pan_anim);
 
    _ewk_view_parent_sc.sc.del(obj);
 }
@@ -911,7 +911,7 @@ _ewk_view_resized_cb(void *data,
    if (!(sd->zoom.mode != ELM_WEB_ZOOM_MODE_MANUAL))
      return;
 
-   if (sd->zoom.timer) ecore_timer_del(sd->zoom.timer);
+   ecore_timer_del(sd->zoom.timer);
    sd->zoom.timer = ecore_timer_add(0.5, _reset_zoom_timer_cb, data);
 }
 
@@ -1205,8 +1205,8 @@ _elm_web_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 #ifdef HAVE_ELEMENTARY_WEB
    Elm_Web_Smart_Data *sd = _pd;
 
-   if (sd->zoom.timer) ecore_timer_del(sd->zoom.timer);
-   if (sd->bring_in.animator) ecore_animator_del(sd->bring_in.animator);
+   ecore_timer_del(sd->zoom.timer);
+   ecore_animator_del(sd->bring_in.animator);
 
 #else
    (void)_pd;
@@ -2758,7 +2758,7 @@ _region_bring_in(Eo *obj, void *_pd, va_list *list)
    sd->bring_in.start.y = sy;
    sd->bring_in.end.x = rx;
    sd->bring_in.end.y = ry;
-   if (sd->bring_in.animator) ecore_animator_del(sd->bring_in.animator);
+   ecore_animator_del(sd->bring_in.animator);
    sd->bring_in.animator = ecore_animator_timeline_add(
        _elm_config->bring_in_scroll_friction, _bring_in_anim_cb, obj);
 #else
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 19d64904f..2e493242b 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -339,7 +339,7 @@ _elm_win_state_eval(void *data EINA_UNUSED)
 static void
 _elm_win_state_eval_queue(void)
 {
-   if (_elm_win_state_eval_job) ecore_job_del(_elm_win_state_eval_job);
+   ecore_job_del(_elm_win_state_eval_job);
    _elm_win_state_eval_job = ecore_job_add(_elm_win_state_eval, NULL);
 }
 
@@ -644,7 +644,7 @@ _elm_win_resize(Ecore_Evas *ee)
    Elm_Win_Smart_Data *sd = _elm_win_associate_get(ee);
    EINA_SAFETY_ON_NULL_RETURN(sd);
 
-   if (sd->deferred_resize_job) ecore_job_del(sd->deferred_resize_job);
+   ecore_job_del(sd->deferred_resize_job);
    sd->deferred_resize_job = ecore_job_add(_elm_win_resize_job, sd->obj);
 }
 
@@ -812,8 +812,7 @@ _elm_win_focus_highlight_reconfigure_job(void *data)
 static void
 _elm_win_focus_highlight_reconfigure_job_start(Elm_Win_Smart_Data *sd)
 {
-   if (sd->focus_highlight.reconf_job)
-     ecore_job_del(sd->focus_highlight.reconf_job);
+   ecore_job_del(sd->focus_highlight.reconf_job);
 
    sd->focus_highlight.reconf_job = ecore_job_add(
        _elm_win_focus_highlight_reconfigure_job, sd->obj);
@@ -1467,16 +1466,14 @@ _elm_win_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
         ecore_evas_callback_resize_set(sd->ee, NULL);
      }
 
-   if (sd->deferred_resize_job) ecore_job_del(sd->deferred_resize_job);
-   if (sd->deferred_child_eval_job) ecore_job_del(sd->deferred_child_eval_job);
-   if (sd->shot.info) eina_stringshare_del(sd->shot.info);
-   if (sd->shot.timer) ecore_timer_del(sd->shot.timer);
+   ecore_job_del(sd->deferred_resize_job);
+   ecore_job_del(sd->deferred_child_eval_job);
+   eina_stringshare_del(sd->shot.info);
+   ecore_timer_del(sd->shot.timer);
 
 #ifdef HAVE_ELEMENTARY_X
-   if (sd->x.client_message_handler)
-     ecore_event_handler_del(sd->x.client_message_handler);
-   if (sd->x.property_handler)
-     ecore_event_handler_del(sd->x.property_handler);
+   ecore_event_handler_del(sd->x.client_message_handler);
+   ecore_event_handler_del(sd->x.property_handler);
 #endif
 
    if (sd->img_obj)
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 867ad841e..9157f312f 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -233,7 +233,7 @@ _elm_tooltip_reconfigure_job_stop(Elm_Tooltip *tt)
 static void
 _elm_tooltip_reconfigure_job_start(Elm_Tooltip *tt)
 {
-   if (tt->reconfigure_job) ecore_job_del(tt->reconfigure_job);
+   ecore_job_del(tt->reconfigure_job);
    tt->reconfigure_job = ecore_job_add(_elm_tooltip_reconfigure_job, tt);
 }