diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index d535bf0ba..108a3f982 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -153,9 +153,7 @@ EAPI int E_EVENT_BORDER_PROPERTY = 0;
 #define GRAV_SET(bd, grav) \
 ecore_x_window_gravity_set(bd->bg_win, grav); \
 ecore_x_window_gravity_set(bd->client.shell_win, grav); \
-ecore_x_window_gravity_set(bd->client.win, grav); \
-ecore_x_window_gravity_set(bd->bg_subwin, grav); \
-ecore_x_window_pixel_gravity_set(bd->bg_subwin, grav);
+ecore_x_window_gravity_set(bd->client.win, grav);
 
 /* externally accessible functions */
 EAPI int
@@ -251,7 +249,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
    e_focus_setup(bd);
    bd->bg_ecore_evas = e_canvas_new(e_config->evas_engine_borders, bd->win,
 				    0, 0, bd->w, bd->h, 1, 0,
-				    &(bd->bg_win), &(bd->bg_subwin));
+				    &(bd->bg_win));
    e_canvas_add(bd->bg_ecore_evas);
    bd->event_win = ecore_x_window_input_new(bd->win, 0, 0, bd->w, bd->h);
    bd->bg_evas = ecore_evas_get(bd->bg_ecore_evas);
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 15778cd9a..6d899a2ce 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -159,7 +159,6 @@ struct _E_Border
    Ecore_Evas     *bg_ecore_evas;
    Evas           *bg_evas;
    Ecore_X_Window  bg_win;
-   Ecore_X_Window  bg_subwin;
    Evas_Object    *bg_object;
    Evas_Object    *icon_object;
    Ecore_X_Window  event_win;
diff --git a/src/bin/e_canvas.c b/src/bin/e_canvas.c
index 91f194b83..7aade599c 100644
--- a/src/bin/e_canvas.c
+++ b/src/bin/e_canvas.c
@@ -181,8 +181,7 @@ e_canvas_rehint(void)
 
 EAPI Ecore_Evas *
 e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
-	     int direct_resize, int override, Ecore_X_Window *win_ret,
-	     Ecore_X_Window *subwin_ret)
+	     int direct_resize, int override, Ecore_X_Window *win_ret)
 {
    Ecore_Evas *ee;
    int engine;
@@ -196,7 +195,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
 	     ecore_evas_override_set(ee, override);
 	     if (direct_resize) ecore_evas_gl_x11_direct_resize_set(ee, 1);
 	     if (win_ret) *win_ret = ecore_evas_gl_x11_window_get(ee);
-	     if (subwin_ret) *subwin_ret = ecore_evas_gl_x11_subwindow_get(ee);
 	  }
 	else
 	  goto try2;
@@ -209,7 +207,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
 	     ecore_evas_override_set(ee, override);
 	     if (direct_resize) ecore_evas_xrender_x11_direct_resize_set(ee, 1);
 	     if (win_ret) *win_ret = ecore_evas_xrender_x11_window_get(ee);
-	     if (subwin_ret) *subwin_ret = ecore_evas_xrender_x11_subwindow_get(ee);
 	  }
 	else
 	  goto try2;
@@ -222,7 +219,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
 	     ecore_evas_override_set(ee, override);
 	     if (direct_resize) ecore_evas_software_x11_16_direct_resize_set(ee, 1);
 	     if (win_ret) *win_ret = ecore_evas_software_x11_16_window_get(ee);
-	     if (subwin_ret) *subwin_ret = ecore_evas_software_x11_16_subwindow_get(ee);
 	  }
 	else
 	  goto try2;
@@ -236,7 +232,6 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
 	     ecore_evas_override_set(ee, override);
 	     if (direct_resize) ecore_evas_software_x11_direct_resize_set(ee, 1);
 	     if (win_ret) *win_ret = ecore_evas_software_x11_window_get(ee);
-	     if (subwin_ret) *subwin_ret = ecore_evas_software_x11_subwindow_get(ee);
 	  }
      }
    return ee;
diff --git a/src/bin/e_canvas.h b/src/bin/e_canvas.h
index 1b4b569c0..d7cf0c486 100644
--- a/src/bin/e_canvas.h
+++ b/src/bin/e_canvas.h
@@ -14,7 +14,7 @@ EAPI void        e_canvas_cache_flush(void);
 EAPI void        e_canvas_cache_reload(void);
 EAPI void        e_canvas_idle_flush(void);
 EAPI void        e_canvas_rehint(void);
-EAPI Ecore_Evas *e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_X_Window *win_ret, Ecore_X_Window *subwin_ret);
+EAPI Ecore_Evas *e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_X_Window *win_ret);
 
 #endif
 #endif
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index 308bf0d54..b79b9ddf3 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -89,7 +89,7 @@ e_container_new(E_Manager *man)
 
    con->bg_ecore_evas = e_canvas_new(e_config->evas_engine_container, con->win,
 				     0, 0, con->w, con->h, 1, 1,
-				     &(con->bg_win), NULL);
+				     &(con->bg_win));
    e_canvas_add(con->bg_ecore_evas);
    con->event_win = ecore_x_window_input_new(con->bg_win, 0, 0, con->w, con->h);
    ecore_x_window_show(con->event_win);
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 9029fec7e..3b9c45146 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -185,7 +185,7 @@ e_drag_new(E_Container *container, int x, int y,
    e_object_ref(E_OBJECT(drag->container));
    drag->ecore_evas = e_canvas_new(e_config->evas_engine_drag, drag->container->win,
 				   drag->x, drag->y, drag->w, drag->h, 1, 1,
-				   &(drag->evas_win), NULL);
+				   &(drag->evas_win));
    if (e_config->use_composite)
      {
 	ecore_evas_alpha_set(drag->ecore_evas, 1);
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 8ff0f563a..3bc486909 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1401,7 +1401,7 @@ _e_menu_realize(E_Menu *m)
    m->ecore_evas = 
      e_canvas_new(e_config->evas_engine_menus, m->zone->container->win,
                   m->cur.x, m->cur.y, m->cur.w, m->cur.h, 1, 1,
-                  &(m->evas_win), NULL);
+                  &(m->evas_win));
    e_canvas_add(m->ecore_evas);
    m->shape = e_container_shape_add(m->zone->container);
    e_container_shape_move(m->shape, m->cur.x, m->cur.y);
diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index 438c5a9ed..f9bbe91dc 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -67,7 +67,7 @@ e_popup_new(E_Zone *zone, int x, int y, int w, int h)
    pop->layer = 250;
    pop->ecore_evas = e_canvas_new(e_config->evas_engine_popups, pop->zone->container->win,
 				  pop->zone->x + pop->x, pop->zone->y + pop->y, pop->w, pop->h, 1, 1,
-				  &(pop->evas_win), NULL);
+				  &(pop->evas_win));
    /* avoid excess exposes when shaped - set damage avoid to 1 */
 //   ecore_evas_avoid_damage_set(pop->ecore_evas, 1);
    
diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index fef2ec886..1c9b920c6 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -47,7 +47,7 @@ e_win_new(E_Container *con)
    win->engine = e_canvas_engine_decide(e_config->evas_engine_win);
    win->ecore_evas = e_canvas_new(e_config->evas_engine_win, con->manager->root,
 				  0, 0, 1, 1, 1, 0,
-				  &(win->evas_win), NULL);
+				  &(win->evas_win));
    e_canvas_add(win->ecore_evas);
    ecore_evas_data_set(win->ecore_evas, "E_Win", win);
    ecore_evas_callback_move_set(win->ecore_evas, _e_win_cb_move);
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 5b0ddab97..e9e2a1b45 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -179,7 +179,7 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
    /* TODO: config the ecore_evas type. */
    zone->black_ecore_evas = 
      e_canvas_new(e_config->evas_engine_zone, zone->container->win,
-                  0, 0, zone->w, zone->h, 1, 1, &(zone->black_win), NULL);
+                  0, 0, zone->w, zone->h, 1, 1, &(zone->black_win));
    e_canvas_add(zone->black_ecore_evas);
    ecore_evas_layer_set(zone->black_ecore_evas, 6);
    zone->black_evas = ecore_evas_get(zone->black_ecore_evas);
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index 703afd600..a4b30d946 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -446,7 +446,7 @@ _gadman_gadcon_new(const char* name, int ontop)
      {
         Man->top_ee = e_canvas_new(e_config->evas_engine_popups,
                                    Man->container->win, 0, 0, 0, 0, 1, 1,
-                                   &(Man->top_win), NULL);
+                                   &(Man->top_win));
 
         if (Man->use_composite)
           {