diff --git a/src/bin/window.c b/src/bin/window.c
index 1d4092a..0971327 100644
--- a/src/bin/window.c
+++ b/src/bin/window.c
@@ -343,10 +343,6 @@ _window_create(void)
         _window_channel_focus(chl);
      }
 
-   /* FIXME: Remove. Only for testing */
-   /* if ((chl = _window_channel_create("Test"))) */
-   /*   _window_channel_count_update(chl); */
-
    /* update window transparency from config */
    _window_update();
 
@@ -733,17 +729,14 @@ _window_network_channels_create(Express_Network *net)
    Channel *chl;
    Express_Server *srv;
    const char *name, *srv_name = NULL;
-   /* int i = -1; */
+   int i = -1;
 
    /* remove the default channel window
     * 
     * TODO:
     * NB: This COULD become a config option for 'server message window' 
     * and optionally be left open to display server messages */
-   /* _window_channel_destroy("Default"); */
-
-   /* if ((chl = _window_channel_find("Default"))) */
-   /*   _window_channel_unswallow(chl); */
+   _window_channel_destroy("Default");
 
    /* get the name of this network */
    name = express_network_name_get(net);
@@ -770,16 +763,16 @@ _window_network_channels_create(Express_Network *net)
              if (!(chl = _window_channel_create(cfg_chl->name, srv_name))) 
                continue;
 
-             /* if (i < 0) */
-             /*   { */
+             if (i < 0)
+               {
                   /* if this is the first channel, swallow it */
-                  /* _window_channel_swallow(chl); */
+                  _window_channel_swallow(chl);
 
                   /* focus this channel */
-                  /* _window_channel_focus(chl); */
-               /* } */
+                  _window_channel_focus(chl);
+               }
 
-             /* i++; */
+             i++;
           }
 
         break;