diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index cbebe01d2..cbfee98ce 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -603,7 +603,6 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
    title = cw->ec->icccm.title;
    skip = (title && (!strncmp(title, "noshadow", 8)));
 
-   /* skipping here is mostly a hack for systray because I hate it */
    if (!skip)
      {
         EINA_LIST_FOREACH(list, l, m)
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 4908d1480..5311854b9 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -2374,9 +2374,6 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
    if (gcc->gadcon->drag_gcc) return;
    if (!zone) return;
 
-   if (!e_util_strcmp(gcc->client_class->name, "systray"))
-     return;
-
    e_gadcon_client_drag_set(gcc);
 
    e_object_ref(E_OBJECT(gcc));
@@ -2708,10 +2705,6 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
    int changes = 0;
 
    if (!gcc->moving) return;
-   /* we need to get output not canvas because things like systray
-      can reparent another window so we get no position here */
-   /* maybe we should better grab mouse while move resize is active...*/
-   //evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
    if (gcc->gadcon->toolbar)
      evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
    else
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 4808c66f6..2d211763e 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1822,20 +1822,6 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA
      }
 }
 
-static Eina_Bool
-_e_shelf_cb_mouse_move_autohide_fuck_systray(E_Shelf *es)
-{
-   int x, y;
-   Ecore_Event_Mouse_Move ev;
-
-   memset(&ev, 0, sizeof(Ecore_Event_Mouse_Move));
-   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
-   ev.root.x = e_comp_canvas_x_root_unadjust(x);
-   ev.root.y = e_comp_canvas_y_root_unadjust(y);
-   _e_shelf_cb_mouse_in(es, ECORE_EVENT_MOUSE_MOVE, &ev);
-   return EINA_TRUE;
-}
-
 static Eina_Bool
 _e_shelf_cb_mouse_in(void *data, int type, void *event)
 {
@@ -1949,11 +1935,6 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
         Eina_Bool inside = EINA_FALSE;
 
         ev = event;
-        /* FIXME: checking every mouse movement here is only necessary because of
-         * shitty systray embedding xwindows into itself which generates unreliable
-         * mouse in/out events. in the future, when we remove systray, we should go
-         * back to mouse in/out events
-         */
         inside = E_INSIDE(e_comp_canvas_x_root_adjust(ev->root.x),
                           e_comp_canvas_y_root_adjust(ev->root.y),
                           es->zone->x, es->zone->y, es->zone->w + 4, es->zone->h + 4);
@@ -1969,8 +1950,6 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
           {
              if (es->autohide_timer)
                ecore_timer_loop_reset(es->autohide_timer);
-             else
-               es->autohide_timer = ecore_timer_loop_add(0.5, (Ecore_Task_Cb)_e_shelf_cb_mouse_move_autohide_fuck_systray, es);
           }
         if (inside)
           {
@@ -2015,21 +1994,6 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
 
         if (ev->win != e_comp->ee_win) return ECORE_CALLBACK_PASS_ON;
 
-        /*
-         * ECORE_X_EVENT_DETAIL_INFERIOR means focus went to children windows
-         * so do not hide shelf on this case (ie: systray base window, or
-         * embedded icons).
-         *
-         * Problem: when child window get mouse out, shelf window will
-         * not get mouse out itself, so it will stay visible and
-         * autohide will fail.
-         */
-        if (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR)
-          {
-             //fprintf(stderr, "SYSTRAYED\n");
-             return ECORE_CALLBACK_PASS_ON;
-          }
-
         evas_object_geometry_get(es->o_event, &x, &y, &w, &h);
         if (!E_INSIDE(ev->x, ev->y, x, y, w, h))
           {