diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index e1b43bc5e..40ea2d6f9 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -343,12 +343,8 @@ struct _E_Comp_Wl_Client_Data
    E_Comp_X_Client_Data *xwayland_data;
 #endif
 
-   Eina_Bool keep_buffer : 1;
    Eina_Bool mapped : 1;
-   Eina_Bool change_icon : 1;
    Eina_Bool evas_init : 1;
-   Eina_Bool set_win_type : 1;
-   Eina_Bool frame_update : 1;
    Eina_Bool cursor : 1;
    Eina_Bool moved : 1;
    Eina_Bool maximizing : 1;
diff --git a/src/modules/wl_desktop_shell/e_mod_input_panel.c b/src/modules/wl_desktop_shell/e_mod_input_panel.c
index 0763c39ff..06bdc5805 100644
--- a/src/modules/wl_desktop_shell/e_mod_input_panel.c
+++ b/src/modules/wl_desktop_shell/e_mod_input_panel.c
@@ -236,7 +236,6 @@ _e_input_panel_cb_surface_get(struct wl_client *client, struct wl_resource *reso
    ec->no_shape_cut = EINA_TRUE;
    ec->border_size = 0;
    ec->netwm.type = E_WINDOW_TYPE_UTILITY;
-   ec->comp_data->set_win_type = EINA_TRUE;
 
 
    cd->surface = surface_resource;
diff --git a/src/modules/wl_desktop_shell/wl_shell.c b/src/modules/wl_desktop_shell/wl_shell.c
index ba41905a1..bd6bf8f67 100644
--- a/src/modules/wl_desktop_shell/wl_shell.c
+++ b/src/modules/wl_desktop_shell/wl_shell.c
@@ -130,7 +130,6 @@ _wl_shell_surface_cb_toplevel_set(struct wl_client *client EINA_UNUSED, struct w
    if ((!ec->internal) || (!ec->borderless))
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->netwm.type = E_WINDOW_TYPE_NORMAL;
-   ec->comp_data->set_win_type = EINA_TRUE;
    if ((!ec->lock_user_maximize) && (ec->maximized))
      e_client_unmaximize(ec, E_MAXIMIZE_BOTH);
    if ((!ec->lock_user_fullscreen) && (ec->fullscreen))
@@ -163,7 +162,6 @@ _wl_shell_surface_cb_transient_set(struct wl_client *client EINA_UNUSED, struct
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->netwm.type = E_WINDOW_TYPE_DIALOG;
    ec->dialog = EINA_TRUE;
-   ec->comp_data->set_win_type = EINA_TRUE;
    if ((!ec->lock_user_maximize) && (ec->maximized))
      e_client_unmaximize(ec, E_MAXIMIZE_BOTH);
    if ((!ec->lock_user_fullscreen) && (ec->fullscreen))
@@ -212,7 +210,6 @@ _wl_shell_surface_cb_popup_set(struct wl_client *client EINA_UNUSED, struct wl_r
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->changes.icon = !!ec->icccm.class;
    ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU;
-   ec->comp_data->set_win_type = EINA_TRUE;
 
    cdata = ec->comp_data;
    if (ec->parent)
diff --git a/src/modules/wl_desktop_shell/xdg5.c b/src/modules/wl_desktop_shell/xdg5.c
index 636be87b4..922af8132 100644
--- a/src/modules/wl_desktop_shell/xdg5.c
+++ b/src/modules/wl_desktop_shell/xdg5.c
@@ -705,7 +705,6 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
    if ((!ec->internal) || (!ec->borderless))
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->netwm.type = E_WINDOW_TYPE_NORMAL;
-   ec->comp_data->set_win_type = EINA_TRUE;
 
    if (ec->internal_elm_win && evas_object_visible_get(ec->internal_elm_win))
      _e_xdg_shell_surface_map(surface_resource);
@@ -794,7 +793,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->changes.icon = !!ec->icccm.class;
    ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU;
-   ec->placed = ec->comp_data->set_win_type = EINA_TRUE;
+   ec->placed = EINA_TRUE;
 
    /* set this client as a transient for parent */
    e_shell_surface_parent_set(ec, parent_resource);
diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c
index 1da6fee03..5c6246810 100644
--- a/src/modules/wl_desktop_shell/xdg6.c
+++ b/src/modules/wl_desktop_shell/xdg6.c
@@ -938,7 +938,7 @@ _e_xdg_surface_cb_popup_get(struct wl_client *client, struct wl_resource *resour
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->changes.icon = !!ec->icccm.class;
    ec->netwm.type = E_WINDOW_TYPE_POPUP_MENU;
-   ec->placed = ec->comp_data->set_win_type = EINA_TRUE;
+   ec->placed = EINA_TRUE;
 
    /* set this client as a transient for parent */
    e_shell_surface_parent_set(ec, parent_resource);
@@ -1241,7 +1241,6 @@ _e_xdg_surface_cb_toplevel_get(struct wl_client *client EINA_UNUSED, struct wl_r
    if ((!ec->internal) || (!ec->borderless))
      ec->border.changed = ec->changes.border = !ec->borderless;
    ec->netwm.type = E_WINDOW_TYPE_NORMAL;
-   ec->comp_data->set_win_type = EINA_TRUE;
 
    if (ec->internal_elm_win && evas_object_visible_get(ec->internal_elm_win))
      _e_xdg_shell_surface_map(resource);