diff --git a/src/bin/e.h b/src/bin/e.h
index a61c3ac53..325bcb586 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -7,8 +7,10 @@
 #include "config.h"
 
 #define USE_IPC
-//#define OBJECT_PARANOIA_CHECK
-//#define OBJECT_CHECK
+#if 0
+#define OBJECT_PARANOIA_CHECK
+#define OBJECT_CHECK
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -84,8 +86,10 @@
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
-// BROKEN in gcc 4 on amd64
-//#   pragma GCC visibility push(hidden)
+/* BROKEN in gcc 4 on amd64 */
+#if 0
+#   pragma GCC visibility push(hidden)
+#endif
 #   define EAPI __attribute__ ((visibility("default")))
 #  else
 #   define EAPI
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 7f32bc4ea..f8a01141b 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -752,16 +752,16 @@ ACT_FN_GO(window_move_to)
 
 	if (sscanf(params, "%c%i %c%i", &cx, &x, &cy, &y) == 4)
 	  {
-	     // Nothing, both x and y is updated.
+	     /* Nothing, both x and y is updated. */
 	  }
 	else if (sscanf(params, "* %c%i", &cy, &y) == 2)
 	  {
-	     // Updated y, reset x.
+	     /* Updated y, reset x. */
 	     x = bd->x;
 	  }
 	else if (sscanf(params, "%c%i *", &cx, &x) == 2)
 	  {
-	     // Updated x, reset y.
+	     /* Updated x, reset y. */
 	     y = bd->y;
 	  }
 
@@ -853,7 +853,7 @@ ACT_FN_GO(window_push)
           x = bd->zone->w - bd->w;
         else if (dir == E_DIRECTION_UP)
           y = 0;
-        else // dir == E_DIRECTION_DOWN
+        else /* dir == E_DIRECTION_DOWN */
           y = bd->zone->h - bd->h;
 
         bd_list = e_container_border_list_first(bd->zone->container);
@@ -944,7 +944,7 @@ ACT_FN_GO(window_desk_move_by)
 	to_y = dy + y;
 	while ((desk = e_desk_at_xy_get(bd->zone, to_x, to_y )) == NULL)
 	  {
-	     // here we are out of our desktop range
+	     /* here we are out of our desktop range */
 	     while (to_x >= bd->zone->desk_x_count)
 	       {
 		  to_x -= bd->zone->desk_x_count;
@@ -964,9 +964,9 @@ ACT_FN_GO(window_desk_move_by)
 	
 	if (desk)
 	  {
-	     // switch desktop. Quite usefull from the interface point of view.
+	     /* switch desktop. Quite usefull from the interface point of view. */
 	     e_zone_desk_flip_by(bd->zone, to_x - dx, to_y - dy);
-	     // send the border to the required desktop.
+	     /* send the border to the required desktop. */
 	     e_border_desk_set(bd, desk);
 	     e_border_focus_set(bd, 1, 1);
 	  }
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 475e3a421..7c8467a40 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -350,17 +350,7 @@ _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *sou
    evas_object_move(zone->bg_object, zone->x, zone->y);
    evas_object_resize(zone->bg_object, zone->w, zone->h);
    evas_object_layer_set(zone->bg_object, -1);
-///   printf("CLIP...\n");
    evas_object_clip_set(zone->bg_object, zone->bg_clip_object);
-     {
-	Evas_Coord x, y, w, h;
-	
-	evas_object_geometry_get(zone->bg_clip_object, &x, &y, &w, &h);
-///	printf("END: clip %p to %p [%ix%i+%i+%i]\n",
-///	       zone->bg_object,
-///	       zone->bg_clip_object,
-///	       w, h, x, y);
-     }
    evas_object_show(zone->bg_object);
 }
 
diff --git a/src/bin/e_canvas.c b/src/bin/e_canvas.c
index dd7466efb..26aea6b7f 100644
--- a/src/bin/e_canvas.c
+++ b/src/bin/e_canvas.c
@@ -39,9 +39,6 @@ e_canvas_add(Ecore_Evas *ee)
      }
    else if (e_config->font_hinting == 2)
      evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
-   
-//   evas_image_cache_flush(e);
-//   evas_image_cache_reload(e);
 }
 
 EAPI void
diff --git a/src/bin/e_color.h b/src/bin/e_color.h
index a01aca380..10c710473 100644
--- a/src/bin/e_color.h
+++ b/src/bin/e_color.h
@@ -21,7 +21,7 @@ enum _E_Color_Component
 #ifndef E_COLOR_HEADER
 #define E_COLOR_HEADER
 
-// used so that a single color struct can be shared by all elements of the color dialog
+/* used so that a single color struct can be shared by all elements of the color dialog */
 struct _E_Color
 {
    int r, g, b;
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 4cd6a7843..cd58fd473 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -737,18 +737,20 @@ e_config_init(void)
 	CFG_MODULE("temperature", 1);
 	CFG_MODULE("pager", 1);
      }
+#if 0
      {
-//	E_Font_Fallback* eff;
+	E_Font_Fallback* eff;
 	
 #define CFG_FONTFALLBACK(_name) \
    eff = E_NEW(E_Font_Fallback, 1); \
    eff->name = evas_stringshare_add(_name); \
    e_config->font_fallbacks = evas_list_append(e_config->font_fallbacks, eff)
 	
-//	CFG_FONTFALLBACK("New-Sung");
-//	CFG_FONTFALLBACK("Kochi-Gothic");
-//	CFG_FONTFALLBACK("Baekmuk-Dotum");
+	CFG_FONTFALLBACK("New-Sung");
+	CFG_FONTFALLBACK("Kochi-Gothic");
+	CFG_FONTFALLBACK("Baekmuk-Dotum");
      }
+#endif
      { 
 	E_Font_Default* efd;
 	
@@ -783,9 +785,12 @@ e_config_init(void)
    eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \
    e_config->mouse_bindings = evas_list_append(e_config->mouse_bindings, eb)
 
-	//FIXME: If new mouse binding are added/changed/modified, then do not
-	//forget to reflect those changes in e_int_config_mousebinding.c in
-	//_restore_defaults_cb function
+	/*
+	 * FIXME:
+	 * If new mouse binding are added/changed/modified, then do not
+	 * forget to reflect those changes in e_int_config_mousebinding.c in
+	 * _restore_defaults_cb function
+	 */
 	
 	CFG_MOUSEBIND(E_BINDING_CONTEXT_BORDER, 1,
 		      E_BINDING_MODIFIER_ALT, 0, "window_move", NULL);
@@ -810,9 +815,12 @@ e_config_init(void)
    eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \
    e_config->key_bindings = evas_list_append(e_config->key_bindings, eb)
 
-	//FIXME: If new key binding are added/changed/modified, then do not
-	//forget to reflect those changes in e_int_config_keybinding.c in
-	//_restore_key_binding_defaults_cb function
+	/*
+	 * FIXME:
+	 * If new key binding are added/changed/modified, then do not
+	 * forget to reflect those changes in e_int_config_keybinding.c in 
+	 * _restore_key_binding_defaults_cb function
+	 */
 
 	CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left",
 		    E_BINDING_MODIFIER_SHIFT | E_BINDING_MODIFIER_ALT, 0,
@@ -1096,9 +1104,12 @@ e_config_init(void)
    eb->params = _params == NULL ? NULL : evas_stringshare_add(_params); \
    e_config->wheel_bindings = evas_list_append(e_config->wheel_bindings, eb)
 
-	//FIXME: If new wheel binding are added/changed/modified, then do not
-	//forget to reflect those changes in e_int_config_mousebinding.c in
-	//_restore_defaults_cb function
+	/*
+	 * FIXME:
+	 * If new wheel binding are added/changed/modified, then do not
+	 * forget to reflect those changes in e_int_config_mousebinding.c in
+	 * _restore_defaults_cb function
+	 */
 
 	CFG_WHEELBIND(E_BINDING_CONTEXT_CONTAINER, 0, -1,
 		      E_BINDING_MODIFIER_ALT, 0,
@@ -1221,8 +1232,6 @@ e_config_init(void)
 	CFG_MIME_ICON("image/tiff", "THUMB");
 
 	CFG_MIME_ICON("application/x-desktop", "DESKTOP");
-	
-//	CFG_MIME_ICON("image/*", "e/icons/fileman/mime/image");
      }
    IFCFGEND;
 
@@ -1645,11 +1654,15 @@ e_config_engine_list(void)
 {
    Evas_List *l = NULL;
    l = evas_list_append(l, strdup("SOFTWARE"));
-// DISABLE GL as an accessible engine - it does have problems, ESPECIALLY with
-// shaped windows (it can't do them), and multiple gl windows and shared
-// contexts, so for now just disable it. xrender is much more complete in
-// this regard.
-//   l = evas_list_append(l, strdup("GL"));
+   /*
+    * DISABLE GL as an accessible engine - it does have problems, ESPECIALLY with
+    * shaped windows (it can't do them), and multiple gl windows and shared
+    * contexts, so for now just disable it. xrender is much more complete in
+    * this regard.
+    */
+#if 0
+   l = evas_list_append(l, strdup("GL"));
+#endif
    l = evas_list_append(l, strdup("XRENDER"));
    return l;
 }
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index d6df62d6a..74300775e 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -76,7 +76,7 @@ typedef enum _E_Engine_Context
 struct _E_Config
 {
    int         config_version; // INTERNAL
-   int         show_splash; //GUI
+   int         show_splash; // GUI
    const char *init_default_theme; // GUI
    const char *desktop_default_background; // GUI
    Evas_List  *desktop_backgrounds; // GUI
@@ -88,12 +88,12 @@ struct _E_Config
    int         border_shade_animate; // GUI
    int         border_shade_transition; // GUI
    double      border_shade_speed; // GUI
-   double      framerate; //GUI
-   int         image_cache; //GUI
-   int         font_cache; //GUI
-   int         edje_cache; //GUI
-   int         edje_collection_cache; //GUI
-   double      cache_flush_interval; //GUI
+   double      framerate; // GUI
+   int         image_cache; // GUI
+   int         font_cache; // GUI
+   int         edje_cache; // GUI
+   int         edje_collection_cache; // GUI
+   double      cache_flush_interval; // GUI
    int         zone_desks_x_count; // GUI
    int         zone_desks_y_count; // GUI
    int         use_virtual_roots; // NO GUI - maybe remove?
@@ -183,7 +183,7 @@ struct _E_Config
    int         focus_last_focused_per_desktop; // GUI
    int         focus_revert_on_hide_or_close; // GUI
    int         use_e_cursor; // GUI
-   int         cursor_size; //GUI
+   int         cursor_size; // GUI
    int         menu_autoscroll_margin; // GUI
    int         menu_autoscroll_cursor_margin; // GUI
    const char *input_method; // GUI
@@ -230,33 +230,33 @@ struct _E_Config
    int         desklock_autolock_screensaver; // GUI
    int         desklock_autolock_idle; // GUI
    double      desklock_autolock_idle_timeout; // GUI
-   int         desklock_use_custom_desklock; //GUI
+   int         desklock_use_custom_desklock; // GUI
    const char *desklock_custom_desklock_cmd; // GUI
    
-   int         screensaver_enable; //GUI
-   int         screensaver_timeout; //GUI
-   int         screensaver_interval; //GUI
-   int         screensaver_blanking; //GUI
-   int         screensaver_expose; //GUI
+   int         screensaver_enable; // GUI
+   int         screensaver_timeout; // GUI
+   int         screensaver_interval; // GUI
+   int         screensaver_blanking; // GUI
+   int         screensaver_expose; // GUI
   
-   int         dpms_enable; //GUI
-   int         dpms_standby_enable; //GUI
-   int         dpms_standby_timeout; //GUI
-   int         dpms_suspend_enable; //GUI
-   int         dpms_suspend_timeout; //GUI
-   int         dpms_off_enable; //GUI
-   int         dpms_off_timeout; //GUI
+   int         dpms_enable; // GUI
+   int         dpms_standby_enable; // GUI
+   int         dpms_standby_timeout; // GUI
+   int         dpms_suspend_enable; // GUI
+   int         dpms_suspend_timeout; // GUI
+   int         dpms_off_enable; // GUI
+   int         dpms_off_timeout; // GUI
 
-   int         clientlist_group_by; //GUI
-   int         clientlist_include_all_zones; //GUI
-   int         clientlist_separate_with; //GUI
-   int         clientlist_sort_by; //GUI
-   int         clientlist_separate_iconified_apps; //GUI
-   int         clientlist_warp_to_iconified_desktop; //GUI
+   int         clientlist_group_by; // GUI
+   int         clientlist_include_all_zones; // GUI
+   int         clientlist_separate_with; // GUI
+   int         clientlist_sort_by; // GUI
+   int         clientlist_separate_iconified_apps; // GUI
+   int         clientlist_warp_to_iconified_desktop; // GUI
 
-   int         mouse_accel_numerator; //GUI
-   int         mouse_accel_denominator; //GUI
-   int         mouse_accel_threshold; //GUI
+   int         mouse_accel_numerator; // GUI
+   int         mouse_accel_denominator; // GUI
+   int         mouse_accel_threshold; // GUI
    
    int         display_res_restore; // GUI
    int         display_res_width; // GUI
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index f44a887f0..22d70b48d 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -1026,13 +1026,9 @@ _e_container_cb_mouse_down(void *data, int type, void *event)
 
 	e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_CONTAINER,
 					   E_OBJECT(con), ev);
-//	if (!e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_CONTAINER,
-//						E_OBJECT(con), ev))
-	  {
-	     if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
-	     if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
-	     evas_event_feed_mouse_down(con->bg_evas, ev->button, flags, ev->time, NULL);
-	  }
+	if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
+	if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
+	evas_event_feed_mouse_down(con->bg_evas, ev->button, flags, ev->time, NULL);
      }
    return 1;
 }
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 0508f707d..d10ad9ee5 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -324,10 +324,7 @@ e_desk_last_focused_focus(E_Desk *desk)
      {
 	bd = l->data;
 	if ((!bd->iconic) && (bd->visible) &&
-	    (((bd->desk == desk)
-// Don't focus sticky windows as last focused win	       
-//	       || ((bd->sticky) && (bd->zone == desk->zone))
-	       )))
+	    (bd->desk == desk))
 	  {
 	     /* this was the window last focused in this desktop */
 	     e_border_focus_set(bd, 1, 1);
@@ -625,7 +622,7 @@ _e_desk_show_animator(void *data)
 		  dt = (t - bd->fx.start.t) / spd;
 		  if (dt > 1.0) dt = 1.0;
 		  dt = 1.0 - dt;
-		  dt *= dt; // decelerate - could be a better hack
+		  dt *= dt; /* decelerate - could be a better hack */
                   e_border_fx_offset(bd, 
 				     ((double)bd->fx.start.x * dt),
 				     ((double)bd->fx.start.y * dt));
@@ -768,9 +765,7 @@ _e_desk_hide_animator(void *data)
 	       {
 		  dt = (t - bd->fx.start.t) / spd;
 		  if (dt > 1.0) dt = 1.0;
-//		  dt = 1.0 - dt;
-		  dt *= dt; // decelerate - could be a better hack
-//		  dt = 1.0 - dt;
+		  dt *= dt; /* decelerate - could be a better hack */
 		  e_border_fx_offset(bd,
 				     ((double)bd->fx.start.x * dt),
 				     ((double)bd->fx.start.y * dt));
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 7168645ee..0b2ff9dcd 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -409,7 +409,7 @@ _e_desklock_cb_key_down(void *data, int type, void *event)
      _e_desklock_delete();
    else
      {
-	// here we have to grab a password
+	/* here we have to grab a password */
 	if (ev->key_compose)
 	  {
 	     if ((strlen(edd->passwd) < (PASSWD_LEN - strlen(ev->key_compose))))
diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index f8e63852a..c983197d0 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -66,9 +66,7 @@ e_dialog_new(E_Container *con, const char *name, const char *class)
    evas_object_key_grab(o, "Return", mask, ~mask, 0);
    mask = 0;
    evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
-//   mask = 0;
-//   evas_object_key_grab(o, "space", mask, ~mask, 0);
-   
+ 
    evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _e_dialog_cb_key_down, dia);
 
    return dia;
diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index 258b3d4d2..08385ccfd 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -322,8 +322,6 @@ _e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dial
 
    _e_eap_editor_icon_show(cfdata);
 
-// when flipping from advanced to basic - this will already be destroyed.
-//   if (editor->img_widget) evas_object_del(editor->img_widget);
    editor->img_widget = e_widget_button_add(evas, "", NULL,
 					    _e_eap_editor_cb_icon_select, cfdata, editor);
    if (editor->img)
diff --git a/src/bin/e_error.h b/src/bin/e_error.h
index a6ea677e9..cd13e0868 100644
--- a/src/bin/e_error.h
+++ b/src/bin/e_error.h
@@ -3,7 +3,6 @@
  */
 #ifdef E_TYPEDEFS
 
-//#define print0(x, args...)      x ,print1(## args)
 #define e_error_message_show(args...) \
 { \
    char __tmpbuf[4096]; \
diff --git a/src/bin/e_exebuf.c b/src/bin/e_exebuf.c
index a7274eb9a..64a9a26e5 100644
--- a/src/bin/e_exebuf.c
+++ b/src/bin/e_exebuf.c
@@ -800,7 +800,6 @@ _e_exebuf_complete(void)
    _e_exebuf_update();
    if (!update_timer)
      update_timer = ecore_timer_add(MATCH_LAG, _e_exebuf_update_timer, NULL);
-//   _e_exebuf_matches_update();
 }
 
 static void
@@ -818,7 +817,6 @@ _e_exebuf_backspace(void)
 	     _e_exebuf_update();
 	     if (!update_timer)
 	       update_timer = ecore_timer_add(MATCH_LAG, _e_exebuf_update_timer, NULL);
-//	     _e_exebuf_matches_update();
 	  }
      }
 }
@@ -1242,7 +1240,6 @@ _e_exebuf_cb_key_down(void *data, int type, void *event)
 		  _e_exebuf_update();
 		  if (!update_timer)
 		    update_timer = ecore_timer_add(MATCH_LAG, _e_exebuf_update_timer, NULL);
-//		  _e_exebuf_matches_update();
 	       }
 	  }
      }
diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c
index 6ec89a7a5..669cf1123 100644
--- a/src/bin/e_flowlayout.c
+++ b/src/bin/e_flowlayout.c
@@ -472,20 +472,20 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
 
    if (!sd->changed) return;
    
-   // local variables
+   /* local variables */
    x = sd->x;
    y = sd->y;
    w = sd->w;
    h = sd->h;
 
-   // Calculate extents
+   /* Calculate extents */
    _e_flowlayout_smart_extents_calcuate(sd);
    minw = sd->min.w;
    minh = sd->min.h;
    count = evas_list_count(sd->items);
    expand = 0;
 
-   // Too small? move a little
+   /* Too small? move a little */
    if (w < minw)
      {
 	x = x + ((w - minw) * (1.0 - sd->align.x));
@@ -497,7 +497,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
 	h = minh;
      }
 
-   // Some odd expanding counter
+   /* Some odd expanding counter */
    for (l = sd->items; l; l = l->next)
      {
 	E_Flowlayout_Item *bi;
@@ -518,7 +518,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
 	  }
      }
 
-   // If no expansion, w is minw, h is minh
+   /* If no expansion, w is minw, h is minh */
    if (expand == 0)
      {
 	if (sd->horizontal)
@@ -533,7 +533,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
 	  }
      }
    
-   // Some calculations
+   /* Some calculations */
    wdif = w - minw;
    hdif = h - minh;
    if (sd->flowright)
@@ -547,7 +547,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
    cr = 0;
    cc = 0;
 
-   // Now for the real deal
+   /* Now for the real deal */
    for (l = sd->items; l; l = l->next)
      {
 	E_Flowlayout_Item *bi;
@@ -557,10 +557,10 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
 	bi = evas_object_data_get(obj, "e_flowlayout_data");
 	if (bi)
 	  {
-	     // Horiziontal
+	     /* Horiziontal */
 	     if (sd->horizontal)
 	       {
-		  // Homogenous
+		  /* Homogenous */
 		  if (sd->homogenous)
 		    {
 		       Evas_Coord ww, hh, ow, oh;
@@ -635,7 +635,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
 		    {
 		    }
 	       }
-	     // Vertical
+	     /* Vertical */
 	     else
 	       {
 		  if (sd->homogenous)
diff --git a/src/bin/e_flowlayout.h b/src/bin/e_flowlayout.h
index 2e4efbb0b..03a77c127 100644
--- a/src/bin/e_flowlayout.h
+++ b/src/bin/e_flowlayout.h
@@ -30,7 +30,7 @@ EAPI void         e_flowlayout_min_size_get      (Evas_Object *obj, Evas_Coord *
 EAPI void         e_flowlayout_max_size_get      (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
 EAPI void         e_flowlayout_align_get         (Evas_Object *obj, double *ax, double *ay);
 EAPI void         e_flowlayout_align_set         (Evas_Object *obj, double ax, double ay);
-// This function only works if homogenous is set
+/* This function only works if homogenous is set */
 EAPI int          e_flowlayout_max_children      (Evas_Object *obj);
 
 #endif
diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
index 155f9cbb9..1541a50dc 100644
--- a/src/bin/e_fm_main.c
+++ b/src/bin/e_fm_main.c
@@ -560,14 +560,12 @@ _e_file_add_mod(int id, const char *path, int op, int listing)
 static void
 _e_file_add(int id, const char *path, int listing)
 {
-//   printf("+++FADD %s\n", path);
    _e_file_add_mod(id, path, 3, listing);/*file add*/
 }
 
 static void
 _e_file_del(int id, const char *path)
 {
-//   printf("+++FDEL %s\n", path);
    ecore_ipc_server_send(_e_ipc_server,
 			 6/*E_IPC_DOMAIN_FM*/,
 			 4/*file del*/,
@@ -577,7 +575,6 @@ _e_file_del(int id, const char *path)
 static void
 _e_file_mod(int id, const char *path)
 {
-//   printf("+++FMOD %s\n", path);
    _e_file_add_mod(id, path, 5, 0);/*file change*/
 }
 
@@ -627,7 +624,6 @@ _e_cb_file_mon_list_idler(void *data)
 	       _e_file_add(ed->id, buf, 2);
 	     else
 	       _e_file_add(ed->id, buf, 1);
-//	     printf("+++ FLIST %s\n", buf);
 	  }
 	free(file);
 	ed->fq = evas_list_remove_list(ed->fq, ed->fq);
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 0c1f5fef6..de1f7c74b 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1348,8 +1348,6 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even
 			      E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
 	e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
 					ev->button);
-//	evas_event_feed_mouse_up(gcc->gadcon->evas, ev->button,
-//				 EVAS_BUTTON_NONE, ev->timestamp, NULL);
      }
 }
     
@@ -1761,8 +1759,6 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *e
 			      E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
 	e_util_evas_fake_mouse_up_later(gcc->gadcon->evas,
 					ev->button);
-//	evas_event_feed_mouse_up(gcc->gadcon->evas, ev->button,
-//				 EVAS_BUTTON_NONE, ev->timestamp, NULL);
      }
 }
 
@@ -1919,9 +1915,6 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
 	else
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w);
 
-	//gcc->config.pos will be set in smart_recofigure
-	//gcc->config.size will be set in smart_reconfigure
-	//original: gcc->config.pos = gcc->sx + x;
 	gcc->config.size = w;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = w;
@@ -1933,9 +1926,6 @@ _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission,
 	else
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h);
 
-	//gcc->config.pos will be set in smart_recofigure
-	//gcc->config.size will be set in smart_reconfigure
-	//original: gcc->config.pos = gcc->sy + y;
 	gcc->config.size = h;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = h;
@@ -2017,10 +2007,6 @@ _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emi
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + x, w - x);
 	else
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w - x);
-	//gcc->config.pos will be set in smart_reconfigure
-	//gcc->config.size will be set in smart_reconfigure
-	//original: gcc->config.pos = gcc->sx + x;
-	//original: gcc->config.size = gcc->sw - x;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = w;
      }
@@ -2030,10 +2016,6 @@ _e_gadcon_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emi
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + y, h - y);
 	else
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h - y);
-	//gcc->config.pos will be set in smart_reconfigure
-	//gcc->config.size will be set in smart_reconfigure
-	//original: gcc->config.pos = gcc->sy + y;
-	//original: gcc->config.size = gcc->sh - y;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = h; 
 	
@@ -2096,10 +2078,6 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *em
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos, w + x);
 	else
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos, w + x);
-	//gcc->config.pos is set inside smart_reconfigure
-	//gcc->config.size is set inside smart_reconfigure
-	//original: gcc->config.pos = gcc->sx;
-	//original: gcc->config.size = gcc->sw + x;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = w;
      }
@@ -2109,10 +2087,6 @@ _e_gadcon_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *em
 	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos, h + y);
 	else
 	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos, h + y);
-	//gcc->config.pos is set inside smart_reconfigure
-	//gcc->config.size is set inside smart_reconfigure
-	//original: gcc->config.pos = gcc->sy;
-	//original: gcc->config.size = gcc->sh + y;
 	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
 	gcc->config.res = h;
      }
@@ -2518,9 +2492,11 @@ e_gadcon_layout_pack(Evas_Object *obj, Evas_Object *child)
 static void
 e_gadcon_layout_pack_size_set(Evas_Object *obj, int size)
 {
-   //FIXME: simplify this function until the 
-   //is redone _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
-   //
+   /*
+    * FIXME:
+    * simplify this function until the is redone
+    * _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
+    */
    E_Gadcon_Layout_Item *bi;
    int xx;
 
@@ -2764,13 +2740,10 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
 	return;
      }
 
-   //x = sd->x; y = sd->y; w = sd->w; h = sd->h;
    min = mino = cur = 0;
 
    _e_gadcon_layout_smart_min_cur_size_calc(sd, &min, &mino, &cur); 
 
-   // update sd info about minw req etc
-   // here request for gadcon size !!
    if (sd->horizontal)
      {
 	if ((sd->minw != min) || (sd->minh != mino))
@@ -3107,7 +3080,6 @@ _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino,
    E_Gadcon_Layout_Item	*bi;
    Evas_List *l;
 
-   // how much space all the gadgets takes in the shelf
    for (l = sd->items; l; l = l->next)
      {
 	bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
@@ -3152,7 +3124,6 @@ _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino,
 	       {
 		  *min += bi->min.w;
 		  if (bi->min.h > *mino) *mino = bi->min.h;
-		  //if (bi->min.w > *mino) *mino = bi->min.w;
 		  if (bi->ask.size < bi->min.w)
 		    *cur += bi->min.w;
 		  else
@@ -3161,7 +3132,6 @@ _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino,
 	     else
 	       {
 		  *min += bi->min.h;
-		  //if (bi->min.h > *mino) *mino = bi->min.h;
 		  if (bi->min.w > *mino) *mino = bi->min.w;
 		  if (bi->ask.size < bi->min.h)
 		    *cur += bi->min.h;
@@ -4170,7 +4140,6 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
 	LC_FREE(lc_back);
      }
 
-   //set lc_moving->items->data->gcc->config.pos;
    if (sd->horizontal) 
      { 
 	bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x; 
@@ -4432,8 +4401,6 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 		  bi->y = bi2->y + bi2->h;
 	       }
 
-	     //bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
-
 	     t = bi->gcc->state_info.seq;
 	     bi->gcc->state_info.seq = bi2->gcc->state_info.seq;
 	     bi2->gcc->state_info.seq = t;
diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h
index 6c12a0da3..f43e4471e 100644
--- a/src/bin/e_gadcon.h
+++ b/src/bin/e_gadcon.h
@@ -120,7 +120,7 @@ struct _E_Gadcon_Client
    } config; 
 
    struct { 
-     int seq, flags; // goes to save
+     int seq, flags; /* goes to save */
      int state, resist;
      int prev_pos, prev_size;
      int want_save : 1;
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index d1ac75c65..25ef8209d 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -440,7 +440,6 @@ e_hints_window_init(E_Border *bd)
      {
 	if (bd->client.netwm.desktop == 0xffffffff)
 	  {
-//	     printf("CLIENT asks for all desks!\n");
 	     e_border_stick(bd);
 	  }
 	else if (bd->client.netwm.desktop < (bd->zone->desk_x_count * bd->zone->desk_y_count))
diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c
index 1c699c14b..07ce3741f 100644
--- a/src/bin/e_ilist.c
+++ b/src/bin/e_ilist.c
@@ -197,7 +197,6 @@ e_ilist_selected_set(Evas_Object *obj, int n)
    i = evas_list_count(sd->items);
    if (n >= i) n = i - 1;
    else if (n < 0) n = 0;
-//   if (sd->selected == n) return;
 
    for (l = sd->items; l; l = l->next) 
      {
@@ -307,7 +306,6 @@ e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Ev
    
    API_ENTRY return;
    if (!sd->items) return;
-//   if (sd->multi_select) return;
    if (sd->selected < 0) return;
    si = evas_list_nth(sd->items, sd->selected);
    if (!si) return;
diff --git a/src/bin/e_imc_main.c b/src/bin/e_imc_main.c
index 93e077b32..42fc9896d 100644
--- a/src/bin/e_imc_main.c
+++ b/src/bin/e_imc_main.c
@@ -3,7 +3,6 @@
  */
 #include "e.h"
 
-//extern int errno;
 static void _e_help(void);
 
 /* externally accessible functions */
diff --git a/src/bin/e_int_border_locks.c b/src/bin/e_int_border_locks.c
index 85262cc97..23bf6f2ab 100644
--- a/src/bin/e_int_border_locks.c
+++ b/src/bin/e_int_border_locks.c
@@ -28,7 +28,7 @@ struct _E_Config_Dialog_Data
 	 int size;
 	 int stacking;
 	 int iconify;
-	 int desk; // unused atm
+	 int desk; /* unused atm */
 	 int sticky;
 	 int shade;
 	 int maximize;
@@ -36,8 +36,8 @@ struct _E_Config_Dialog_Data
       } user, client;
       int border;
       int close;
-      int focus_in; // unused atm
-      int focus_out; // unised atm
+      int focus_in; /* unused atm */
+      int focus_out; /* unused atm */
       int life;
       
       int remember;
diff --git a/src/bin/e_int_config_apps.c b/src/bin/e_int_config_apps.c
index 4e564a23f..89b504769 100644
--- a/src/bin/e_int_config_apps.c
+++ b/src/bin/e_int_config_apps.c
@@ -325,8 +325,6 @@ _cb_editor_del(void *obj)
    cfdata->editor = NULL;
    e_object_del_attach_func_set(obj, NULL);
    e_object_data_set(obj, NULL);
-//   e_fm2_refresh(cfdata->gui.o_fm);
-//   e_fm2_refresh(cfdata->gui.o_fm_all);
 }
 #endif
 
@@ -445,10 +443,7 @@ _cb_files_edited(void *data, E_Menu *m, E_Menu_Item *mi)
 
    realpath = e_fm2_real_path_get(cfdata->gui.o_fm_all);
 
-//   if (info->pseudo_link)
-//     snprintf(buf, sizeof(buf), "%s/%s", info->link, info->file);
-//   else
-     snprintf(buf, sizeof(buf), "%s/%s", realpath, info->file);
+   snprintf(buf, sizeof(buf), "%s/%s", realpath, info->file);
 
    if (ecore_file_is_dir(buf)) return;
    a = e_app_new(buf, 0);
@@ -534,15 +529,11 @@ _cb_button_add(void *data1, void *data2)
       {
          if (!cfdata->gui.o_fm) return;
 
-//         a = e_app_new(buf, 0);
          realpath = e_fm2_real_path_get(cfdata->gui.o_fm);
-//         parent = e_app_new(realpath, 0);
-//         if (parent) e_app_subdir_scan(parent, 0);
-//         e_app_append(a, parent);
          _append_to_order(realpath, ecore_file_get_file(buf));
       }
 
-// FIXME: When fm is fixed to create the .order files for us, then we can remove this.
+   /* FIXME: When fm is fixed to create the .order files for us, then we can remove this. */
    e_fm2_refresh(cfdata->gui.o_fm);
 }
 
diff --git a/src/bin/e_int_config_cfgdialogs.c b/src/bin/e_int_config_cfgdialogs.c
index d3cdc3164..eef8a8cb4 100644
--- a/src/bin/e_int_config_cfgdialogs.c
+++ b/src/bin/e_int_config_cfgdialogs.c
@@ -81,11 +81,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    
    o = e_widget_list_add(evas, 0, 0);
       
-//   of = e_widget_framelist_add(evas, _("General Settings"), 0);
-//   ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply));
-//   e_widget_framelist_object_append(of, ob);
-//   e_widget_list_object_append(o, of, 1, 1, 0.5);   
-   
    of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0);
    rg = e_widget_radio_group_new(&(cfdata->default_mode));
 
@@ -118,11 +113,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    
    o = e_widget_list_add(evas, 0, 0);
 
-//   of = e_widget_framelist_add(evas, _("General Settings"), 0);
-//   ob = e_widget_check_add(evas, _("Auto-Apply Configuration Changes"), &(cfdata->auto_apply));
-//   e_widget_framelist_object_append(of, ob);
-//   e_widget_list_object_append(o, of, 1, 1, 0.5);   
-   
    of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0);
    rg = e_widget_radio_group_new(&(cfdata->default_mode));
 
diff --git a/src/bin/e_int_config_clientlist.c b/src/bin/e_int_config_clientlist.c
index c7cf51cf4..706e68049 100644
--- a/src/bin/e_int_config_clientlist.c
+++ b/src/bin/e_int_config_clientlist.c
@@ -100,7 +100,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_check_add(evas, _("Include windows from other screens"), &(cfdata->include_all_zones));
    e_widget_framelist_object_append(of, ob);
-   //e_widget_list_object_append(o, of, 1, 1, 0.5);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
    
    of = e_widget_framelist_add(evas, _("Separate Groups By"), 0);
@@ -111,7 +110,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Using menus"), E_CLIENTLIST_GROUP_SEP_MENU, rg);
    e_widget_framelist_object_append(of, ob);
-   //e_widget_list_object_append(o, of, 1, 1, 0.5);
    e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
    
    of = e_widget_framelist_add(evas, _("Client Sort Order"), 0);
@@ -124,7 +122,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Most recently used"), E_CLIENTLIST_SORT_MOST_RECENT, rg);
    e_widget_framelist_object_append(of, ob);
-   //e_widget_list_object_append(o, of, 1, 1, 0.5);
    e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1);
    
    of = e_widget_framelist_add(evas, _("Iconified Windows"), 0);
@@ -137,7 +134,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_check_add(evas, _("Warp to owning desktop"), &(cfdata->warp_to_iconified_desktop));
    e_widget_framelist_object_append(of, ob);
-   //e_widget_list_object_append(o, of, 1, 1, 0.5);
    e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
 
    e_widget_list_object_append(o, ot, 1, 1, 0.5); 
diff --git a/src/bin/e_int_config_display.c b/src/bin/e_int_config_display.c
index 8a99c2545..0a1cc0874 100644
--- a/src/bin/e_int_config_display.c
+++ b/src/bin/e_int_config_display.c
@@ -352,11 +352,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	  cfdata->flip = cfdata->flip | ECORE_X_RANDR_FLIP_Y;
 	
 	rot = ecore_x_randr_screen_rotation_get(man->root);
-// FIXME: a bug in x where it returns that the current rotation is still
-// normal (none) when it isn't. so just blindly ask for a new rot anyway.
-//	if (rot != (cfdata->rotation | cfdata->flip))
-	  ecore_x_randr_screen_rotation_set(man->root,
-					    cfdata->rotation | cfdata->flip);
+	ecore_x_randr_screen_rotation_set(man->root,
+					  cfdata->rotation | cfdata->flip);
 	e_config->display_res_rotation = cfdata->rotation | cfdata->flip;
      }
    else
diff --git a/src/bin/e_int_config_fonts.c b/src/bin/e_int_config_fonts.c
index 4a5842a42..cefd7c7e5 100644
--- a/src/bin/e_int_config_fonts.c
+++ b/src/bin/e_int_config_fonts.c
@@ -323,7 +323,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 	char *f;
 	
 	f = fonts->data;
-//	if (strstr(f, ":")) continue;
 	l = evas_list_append(l, strdup(f));
      }
    if (l) 
diff --git a/src/bin/e_int_config_icon_themes.c b/src/bin/e_int_config_icon_themes.c
index 126b2c5dc..afed997b9 100644
--- a/src/bin/e_int_config_icon_themes.c
+++ b/src/bin/e_int_config_icon_themes.c
@@ -236,7 +236,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_SHOW_HIDDEN);
    evas_object_smart_callback_add(mt, "dir_changed",
 				  _cb_files_changed, cfdata);
-//   e_fm2_path_set(cfdata->gui.o_fm, "/opt/kde3/share/icons/crystalsvg", "/");
 
    ob = e_widget_scrollframe_pan_add(evas, mt,
 				     e_fm2_pan_set,
diff --git a/src/bin/e_int_config_imc_import.c b/src/bin/e_int_config_imc_import.c
index 6f4d3f2e9..034c3d448 100644
--- a/src/bin/e_int_config_imc_import.c
+++ b/src/bin/e_int_config_imc_import.c
@@ -90,8 +90,6 @@ e_int_config_imc_import(E_Config_Dialog *parent)
    mask = 0;
    evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
    mask = 0;
-//   evas_object_key_grab(o, "space", mask, ~mask, 0);
-//   mask = 0;
    evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, 
 				  _imc_import_cb_key_down, import);
 
diff --git a/src/bin/e_int_config_intl.c b/src/bin/e_int_config_intl.c
index 0a4854d3e..c31fc0385 100644
--- a/src/bin/e_int_config_intl.c
+++ b/src/bin/e_int_config_intl.c
@@ -984,9 +984,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    of = e_widget_frametable_add(evas, _("Language Selector"), 1);
   
    /* Language List */ 
-   //ob = e_widget_label_add(evas, _("Language"));
-   //e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
-    
    ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_lang));
    cfdata->gui.lang_list = ob;
 
@@ -1009,9 +1006,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
   
 
    /* Region List */
-   //ob = e_widget_label_add(evas, _("Region"));
-   //e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); 
-
    ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_reg));
    cfdata->gui.reg_list = ob;
  
@@ -1021,9 +1015,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_ilist_selected_set(ob, e_widget_ilist_selected_get(ob));
    
    /* Codeset List */
-   //ob = e_widget_label_add(evas, _("Codeset"));
-   //e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 1, 1); 
-
    ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_cs));
    cfdata->gui.cs_list = ob;
 
@@ -1032,9 +1023,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_frametable_object_append(of, ob, 2, 0, 1, 4, 1, 1, 1, 1);
    
    /* Modified List */
-   //ob = e_widget_label_add(evas, _("Modifier"));
-   //e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 1, 1); 
-   
    ob = e_widget_ilist_add(evas, 0, 0, &(cfdata->cur_mod));
    cfdata->gui.mod_list = ob;
 
diff --git a/src/bin/e_int_config_keybindings.c b/src/bin/e_int_config_keybindings.c
index 77eff1940..cc020a9dc 100644
--- a/src/bin/e_int_config_keybindings.c
+++ b/src/bin/e_int_config_keybindings.c
@@ -367,7 +367,7 @@ _delete_all_key_binding_cb(void *data, void *data2)
 
    cfdata = data;
 
-   //FIXME: need confirmation dialog
+   /* FIXME: need confirmation dialog */
 
    while (cfdata->binding.key)
      {
@@ -408,7 +408,7 @@ _delete_key_binding_cb(void *data, void *data2)
 	n = cfdata->locals.binding;
 	l = evas_list_nth_list(cfdata->binding.key, atoi(++n));
 
-	//FIXME: need confirmation dialog
+	/* FIXME: need confirmation dialog */
 	if (l)
 	  {
 	     bi = l->data;
diff --git a/src/bin/e_int_config_mouse.c b/src/bin/e_int_config_mouse.c
index d6f83d279..1220a2929 100644
--- a/src/bin/e_int_config_mouse.c
+++ b/src/bin/e_int_config_mouse.c
@@ -71,11 +71,11 @@ static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    e_config->mouse_accel_numerator = cfdata->numerator;
-   // Force denominator to 1 for simplicity.
-   e_config->mouse_accel_denominator = 1; //cfdata->denominator;
+   /* Force denominator to 1 for simplicity. */
+   e_config->mouse_accel_denominator = 1;
    e_config->mouse_accel_threshold = cfdata->threshold;
 
-   // Apply the above settings
+   /* Apply the above settings */
    e_mouse_init();
 
    e_config_save_queue();
diff --git a/src/bin/e_int_config_mousebindings.c b/src/bin/e_int_config_mousebindings.c
index 80f418a3f..8b8c6622a 100644
--- a/src/bin/e_int_config_mousebindings.c
+++ b/src/bin/e_int_config_mousebindings.c
@@ -71,7 +71,7 @@ struct _E_Config_Dialog_Data
        int context;
 
        char *cur;
-       int add; //just to distinguesh among two buttons add/modify
+       int add; /*just to distinguesh among two buttons add/modify */
 
        E_Dialog *dia;
        Ecore_X_Window bind_win;
@@ -478,7 +478,7 @@ _delete_all_mouse_binding_cb(void *data, void *data2)
 
    cfdata = data;
 
-   //FIXME: need confirmation dialog
+   /* FIXME: need confirmation dialog */
    
    while (cfdata->binding.mouse)
      {
@@ -954,7 +954,7 @@ _update_binding_context(E_Config_Dialog_Data *cfdata)
    E_Config_Binding_Wheel *bw;
    E_Binding_Context ctxt;
 
-   // disable all the radios.
+   /* disable all the radios. */
    e_widget_radio_toggle_set(cfdata->gui.context.o_any, 1);
    e_widget_disabled_set(cfdata->gui.context.o_any, 1);
    e_widget_disabled_set(cfdata->gui.context.o_border, 1);
diff --git a/src/bin/e_int_config_paths.c b/src/bin/e_int_config_paths.c
index 51f0debaf..c4807d615 100644
--- a/src/bin/e_int_config_paths.c
+++ b/src/bin/e_int_config_paths.c
@@ -246,8 +246,8 @@ _ilist_path_cb_change(void *data)
    evas_event_thaw(evas_object_evas_get(pcd->cfdata->gui.default_list));
    
    _ilist_update(pcd->cfdata->gui.user_list,
-		 pcd->cfdata->cur_pcd, //Path data to save
-		 pcd); //New Path to show
+		 pcd->cfdata->cur_pcd, /* Path data to save */
+		 pcd); /* New Path to show */
    
    pcd->cfdata->cur_pcd = pcd;
 }
diff --git a/src/bin/e_int_config_screensaver.c b/src/bin/e_int_config_screensaver.c
index 6402c67c8..0ad50176e 100644
--- a/src/bin/e_int_config_screensaver.c
+++ b/src/bin/e_int_config_screensaver.c
@@ -34,7 +34,6 @@ e_int_config_screensaver(E_Container *con)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   //e_widget_disabled_set(ob, !ecore_x_screensaver_event_available_get());
    if (e_config_dialog_find("E", "_config_screensaver_dialog")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
diff --git a/src/bin/e_int_config_theme_import.c b/src/bin/e_int_config_theme_import.c
index c8601ae16..20298fe13 100644
--- a/src/bin/e_int_config_theme_import.c
+++ b/src/bin/e_int_config_theme_import.c
@@ -90,8 +90,6 @@ e_int_config_theme_import(E_Config_Dialog *parent)
    mask = 0;
    evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
    mask = 0;
-//   evas_object_key_grab(o, "space", mask, ~mask, 0);
-//   mask = 0;
    evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, 
 				  _theme_import_cb_key_down, import);
 
diff --git a/src/bin/e_int_config_wallpaper_import.c b/src/bin/e_int_config_wallpaper_import.c
index 03b4bc102..61301b436 100644
--- a/src/bin/e_int_config_wallpaper_import.c
+++ b/src/bin/e_int_config_wallpaper_import.c
@@ -123,8 +123,6 @@ e_int_config_wallpaper_import(E_Config_Dialog *parent)
    mask = 0;
    evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0);
    mask = 0;
-//   evas_object_key_grab(o, "space", mask, ~mask, 0);
-//   mask = 0;
    evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _import_cb_key_down, import);
    
    o = e_widget_list_add(evas, 0, 0);   
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index f8c00f333..7f6e2b7b0 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1285,7 +1285,6 @@ _e_int_menus_clients_free_hook(void *obj)
 	
 	bd = borders->data;
 	borders = evas_list_remove_list(borders, borders);
-//	e_object_breadcrumb_del(E_OBJECT(bd), "clients_menu");
 	e_object_unref(E_OBJECT(bd));
      }
 }
@@ -1378,7 +1377,6 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
 	  e_menu_item_label_set(mi, _("No name!!"));
 	/* ref the border as we implicitly unref it in the callback */
 	e_object_ref(E_OBJECT(bd));
-//	e_object_breadcrumb_add(E_OBJECT(bd), "lost_clients_menu");
 	e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd);
 	if (bd->desktop) e_util_desktop_menu_item_icon_add(bd->desktop, "24x24", mi);
      }
@@ -1401,7 +1399,6 @@ _e_int_menus_lost_clients_free_hook(void *obj)
 	
 	bd = borders->data;
 	borders = evas_list_remove_list(borders, borders);
-//	e_object_breadcrumb_del(E_OBJECT(bd), "lost_clients_menu");
 	e_object_unref(E_OBJECT(bd));
      }
 }
diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index 8d2e80f9d..7c384514b 100644
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -498,8 +498,6 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    of = e_widget_framelist_add(evas, _("Size"), 0);
    ob = e_widget_check_add(evas, _("Shrink to Content Size"), &(cfdata->fit_along));
    e_widget_framelist_object_append(of, ob);
-//   ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size));
-//   e_widget_framelist_object_append(of, ob);
    ob = e_widget_label_add(evas, _("Shelf Size"));
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL, &(cfdata->size), 100);
diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h
index 3acee8fb8..6b52b5c0e 100644
--- a/src/bin/e_ipc_handlers.h
+++ b/src/bin/e_ipc_handlers.h
@@ -5470,7 +5470,6 @@ break;
    START_INT(value, HDL);
    e_config->menu_autoscroll_cursor_margin = value;
    E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50);
-	 //   e_zone_update_flip_all();
    SAVE;
    END_INT;
 #elif (TYPE == E_REMOTE_IN)
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 4fc7e36e8..95f0004c5 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -846,7 +846,6 @@ main(int argc, char **argv)
    e_test();
 
    /* FIXME: for testing only */
-//   
    TS("shelf config init");
    e_shelf_config_init();
    
@@ -1325,7 +1324,6 @@ _e_main_cb_x_fatal(void *data __UNUSED__)
 {
    e_error_message_show("Lost X connection.");
    ecore_main_loop_quit();
-//   _e_main_shutdown(-1);
 }
 
 static int
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index c2f1a9e72..322228437 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -564,7 +564,6 @@ _e_manager_cb_key_down(void *data, int ev_type __UNUSED__, void *ev)
    
    man = data;
    e = ev;
-//   printf("KD %s [win=%x event_win=%x]\n", e->keyname, e->win, e->event_win);
    if (e->event_win != man->root) return 1;
    if (e_bindings_key_down_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(man), ev))
      return 0;
@@ -579,7 +578,6 @@ _e_manager_cb_key_up(void *data, int ev_type __UNUSED__, void *ev)
    
    man = data;
    e = ev;
-//   printf("KU %s [win=%x event_win=%x]\n", e->keyname, e->win, e->event_win);
    return 1;
 }
 
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 2238f74b7..5d504ce39 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -267,12 +267,10 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
 	m->cur.y = y;
 	if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
 	  m->cur.y = y + h - m->cur.h;
-//	_e_menu_activate_first();
 	break;
       case E_MENU_POP_DIRECTION_RIGHT:
 	m->cur.x = x + w;
 	m->cur.y = y;
-//	_e_menu_activate_first();
 	break;
       case E_MENU_POP_DIRECTION_UP:
 	_e_menu_realize(m);
@@ -280,7 +278,6 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
 	if ((m->cur.x + m->cur.w) > (m->zone->x + m->zone->w))
 	  m->cur.x = x + w - m->cur.w;
 	m->cur.y = y - m->cur.h;
-//	_e_menu_activate_last();
 	break;
       case E_MENU_POP_DIRECTION_DOWN:
 	_e_menu_realize(m);
@@ -290,7 +287,6 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
 	m->cur.y = y + h;
 	if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
 	  m->cur.y = y + h - m->cur.h;
-//	_e_menu_activate_first();
 	break;
       case E_MENU_POP_DIRECTION_AUTO:
 	_e_menu_auto_place(m, x, y, w, h);
@@ -888,8 +884,6 @@ e_menu_idler_before(void)
 		  m->prev.h = m->cur.h;
 		  ecore_evas_resize(m->ecore_evas, m->cur.w, m->cur.h);
 		  e_container_shape_resize(m->shape, m->cur.w, m->cur.h);
-//		  evas_obscured_clear(m->evas);
-//		  evas_obscured_rectangle_add(m->evas, 0, 0, m->cur.w, m->cur.h);
 	       }
 	     if (((m->cur.x) != (m->prev.x)) ||
 		 ((m->cur.y) != (m->prev.y)))
@@ -2720,8 +2714,6 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
    dt = dt * dt;
    if ((dt > 0.0) && ((d / dt) >= (fast_move_threshold * fast_move_threshold)))
      is_fast = 1;
-//   printf("d=%i dt=%3.9f fast_move_threshold=%3.3f ---> FAST=%i\n", 
-//	  d, dt, fast_move_threshold, is_fast);
 
    for (l = _e_active_menus; l; l = l->next)
      {
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 9af3dd27a..0be5259d5 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -138,10 +138,11 @@ e_module_new(const char *name)
        (!m->func.about) ||
        (!m->api) ||
        
-       // this is to more forcibly catch old/bad modules. will go - eventually,
-       // but for now is a good check to have
+       /*
+	* this is to more forcibly catch old/bad modules. will go - eventually,
+	* but for now is a good check to have
+	*/
        (dlsym(m->handle, "e_modapi_info"))
-       
        )
      {
 	snprintf(body, sizeof(body), _("There was an error loading module named: %s<br>"
diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c
index 50ad75cfc..3e8890a48 100644
--- a/src/bin/e_moveresize.c
+++ b/src/bin/e_moveresize.c
@@ -116,8 +116,6 @@ e_move_begin(E_Zone *zone, int x, int y)
 	e_popup_edje_bg_object_set(_disp_pop, _obj);
      }
 
-//   e_move_update(x, y);
-   
    if (e_config->move_info_visible)
      {
 	e_popup_move_resize(_disp_pop,
@@ -126,10 +124,7 @@ e_move_begin(E_Zone *zone, int x, int y)
 	      (obj_y - _disp_pop->zone->y) +
 	      ((obj_h - eh) / 2),
 	      ew, eh);
-//   e_popup_show(_disp_pop);
      }
-
-//   visible = 1;
 }
 
 EAPI void
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index cbc324398..5663ca06d 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -65,20 +65,18 @@ EAPI void
 e_object_free(E_Object *obj)
 {
    E_OBJECT_CHECK(obj);
-/*   
-   if (obj->crumbs)
-     {
-	printf("EEEK obj type %x has crumbs still! ->\n", obj->type);
-	e_object_breadcrumb_debug(obj);
-     }
- */
    if (obj->free_att_func) obj->free_att_func(obj);
-// FIXME: although this is good - if during cleanup the cleanup func calls
-// other generic funcs to do cleanups on the same object... we get bitching.
-// disable for now (the final free of the struct should probably happen after
-// the cleanup func and be done byt he object system - set the magic after
-// cleanup :)  
-//   obj->magic = E_OBJECT_MAGIC_FREED;
+   /*
+    * FIXME:
+    * although this is good - if during cleanup the cleanup func calls
+    * other generic funcs to do cleanups on the same object... we get bitching.
+    * disable for now (the final free of the struct should probably happen after
+    * the cleanup func and be done byt he object system - set the magic after
+    * cleanup :)  
+    */
+#if 0
+   obj->magic = E_OBJECT_MAGIC_FREED;
+#endif
    obj->cleanup_func(obj);
 }
 
@@ -214,7 +212,6 @@ e_object_error(E_Object *obj)
      }
    /* display actual error message */
    e_error_message_show("%s", buf);
-//   abort();
    return 1;
 #else
    return 0;
diff --git a/src/bin/e_object.h b/src/bin/e_object.h
index 5e392cdc4..577e3c00c 100644
--- a/src/bin/e_object.h
+++ b/src/bin/e_object.h
@@ -67,7 +67,6 @@ struct _E_Object
    void                  (*del_att_func) (void *obj);
    void                   *data;
    unsigned char           deleted : 1;
-//   Evas_List              *crumbs;
 };
 
 EAPI void *e_object_alloc               (int size, int type, E_Object_Cleanup_Func cleanup_func);
diff --git a/src/bin/e_sha1.h b/src/bin/e_sha1.h
index 008a227f0..679079663 100644
--- a/src/bin/e_sha1.h
+++ b/src/bin/e_sha1.h
@@ -17,8 +17,10 @@
 # else
 #  ifdef __GNUC__
 #   if __GNUC__ >= 4
-// BROKEN in gcc 4 on amd64
-//#   pragma GCC visibility push(hidden)
+/* BROKEN in gcc 4 on amd64 */
+#if 0
+#   pragma GCC visibility push(hidden)
+#endif
 #    define EAPI __attribute__ ((visibility("default")))
 #   else
 #    define EAPI
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 1f9c38404..a76654b88 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -953,8 +953,6 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
 			      E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
 	e_util_evas_fake_mouse_up_later(es->gadcon->evas, 
 					ev->button);
-//	evas_event_feed_mouse_up(es->gadcon->evas, ev->button,
-//				 EVAS_BUTTON_NONE, ev->timestamp, NULL);
      }
 }
 
diff --git a/src/bin/e_spectrum.c b/src/bin/e_spectrum.c
index 9d0f884e9..22ce57fd8 100644
--- a/src/bin/e_spectrum.c
+++ b/src/bin/e_spectrum.c
@@ -299,7 +299,6 @@ _e_spectrum_redraw(void *d)
        for (j = 0; j < sp->iw; j++)
 	 {
 	    vx = (float)j / sp->iw;
-	    //_e_spectrum_2d_color_at(sp, j, i, &r, &g, &b);
 	    _e_spectrum_color_calc(sp, vx, vy, vz, &r, &g, &b);
 	    data[(i * sp->iw) + j] =
 	      (sp->cv->a << 24) |
diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index 9f17e326d..18f3043e2 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -29,11 +29,7 @@ e_startup(E_Startup_Mode mode)
    else if (mode == E_STARTUP_RESTART)
      snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir);
    startup_apps = e_order_new(buf);
-   if (!startup_apps)
-     {
-//	e_init_hide();
-	return;
-     }
+   if (!startup_apps) return;
    start_app_pos = 0;
    _e_startup();
 }
diff --git a/src/bin/e_widget_color_well.c b/src/bin/e_widget_color_well.c
index 8fab978f4..3a1971c3d 100644
--- a/src/bin/e_widget_color_well.c
+++ b/src/bin/e_widget_color_well.c
@@ -12,7 +12,7 @@ struct _E_Widget_Data
 
    E_Color_Dialog *dia;
    E_Color *color;
-   E_Container *con; // container to pop a color dialog up on
+   E_Container *con; /* container to pop a color dialog up on */
    int show_color_dialog;
 };
 
diff --git a/src/bin/e_widget_csel.c b/src/bin/e_widget_csel.c
index d9d7e4c37..5ae10a23f 100644
--- a/src/bin/e_widget_csel.c
+++ b/src/bin/e_widget_csel.c
@@ -58,7 +58,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 
    wd->changing = 1;
 
-   // entry changed
+   /* entry changed */
    for(l = wd->entries, i = 0; l; l = l->next, i++)
      {
 	if (o == l->data)
@@ -115,7 +115,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
      e_widget_cslider_update(wd->vert);
 
 
-   // update the sliders
+   /* update the sliders */
    for (l = wd->sliders, i = 0; l; l = l->next, i++)
      {
 	Evas_Object *so = l->data;
@@ -129,7 +129,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 	  }
      }
 
-   // update the spectrum
+   /* update the spectrum */
    if (o != wd->spectrum && changed != -1)
      {
 	if (wd->mode == changed ||
@@ -142,7 +142,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 
    e_widget_color_well_update(wd->well);
 
-   // now update the text fields to show current values
+   /* now update the text fields to show current values */
    for(l = wd->entries, i = 0; l; l = l->next, i++)
      {
 	char buf[10];
diff --git a/src/bin/e_widget_cslider.c b/src/bin/e_widget_cslider.c
index d2a23d274..3866b6762 100644
--- a/src/bin/e_widget_cslider.c
+++ b/src/bin/e_widget_cslider.c
@@ -73,7 +73,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
    e_widget_resize_object_set(obj, o);
 
-   // add gradient obj
+   /* add gradient obj */
    o = evas_object_gradient_add(evas);
    e_widget_sub_object_add(obj, o);
 
diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c
index 4742b2464..bb5092ff3 100644
--- a/src/bin/e_widget_radio.c
+++ b/src/bin/e_widget_radio.c
@@ -153,23 +153,19 @@ e_widget_radio_toggle_set(Evas_Object *obj, int toggle)
    if (toggle)
      {
 	Evas_List *l;
-	//int toggled = 0;
 	
 	for (l = wd->group->radios; l; l = l->next)
 	  {
-	     //wd = e_widget_data_get(l->data);
 	     if (l->data != obj)
 	       {
 		  wd = e_widget_data_get(l->data);
 		  if (wd->valnum == *(wd->group->valptr))
 		    {
 		       edje_object_signal_emit(wd->o_radio, "e,state,off", "e");
-		       //toggled = 1;
 		       break;
 		    }
 	       }
 	  }
-	//if (!toggled) return;
 	wd = e_widget_data_get(obj);
 	*(wd->group->valptr) = wd->valnum;
 	edje_object_signal_emit(wd->o_radio, "e,state,on", "e");
diff --git a/src/bin/e_widget_spectrum.c b/src/bin/e_widget_spectrum.c
index 20e840a35..243e74538 100644
--- a/src/bin/e_widget_spectrum.c
+++ b/src/bin/e_widget_spectrum.c
@@ -96,7 +96,7 @@ e_widget_spectrum_update(Evas_Object *obj, int redraw)
    double vx, vy;
    
    wd = e_widget_data_get(obj);
-   // redraw spectrum
+   /* redraw spectrum */
    if (redraw)
      e_spectrum_update(wd->o_spectrum);
 
diff --git a/src/bin/e_winlist.c b/src/bin/e_winlist.c
index 03081cc65..811576626 100644
--- a/src/bin/e_winlist.c
+++ b/src/bin/e_winlist.c
@@ -452,9 +452,6 @@ _e_winlist_border_add(E_Border *bd, E_Zone *zone, E_Desk *desk)
 	e_theme_edje_object_set(o, "base/theme/winlist",
 				"e/widgets/winlist/item");
 	edje_object_part_text_set(o, "e.text.label", e_border_name_get(ww->border));
-//	if (!e_config->winlist_warp_while_selecting)
-//	  evas_object_event_callback_add(ww->bg_object, EVAS_CALLBACK_MOUSE_IN,
-//					 _e_winlist_cb_item_mouse_in, ww);
 	evas_object_show(o);
 	if (edje_object_part_exists(ww->bg_object, "e.swallow.icon"))
 	  {
@@ -803,7 +800,6 @@ _e_winlist_cb_key_up(void *data, int type, void *event)
    
    ev = event;
    if (!winlist) return 1;
-//   if (ev->win != input_window) return 1;
    if (hold_mod)
      {
 	if      ((hold_mod & ECORE_X_MODIFIER_SHIFT) && (!strcmp(ev->keysymbol, "Shift_L"))) hold_count--;