diff --git a/src/bin/evas/evas_cserve2_main_loop_linux.c b/src/bin/evas/evas_cserve2_main_loop_linux.c
index 33a9955c10..abbee95998 100644
--- a/src/bin/evas/evas_cserve2_main_loop_linux.c
+++ b/src/bin/evas/evas_cserve2_main_loop_linux.c
@@ -238,23 +238,6 @@ _socket_path_set(char *path)
    /* FIXME: check we can actually create this socket */
    strcpy(path, buf);
    return;
-#if 0   
-   env = getenv("XDG_RUNTIME_DIR");
-   if (!env || !env[0])
-     {
-        env = getenv("HOME");
-        if (!env || !env[0])
-          {
-             env = getenv("TMPDIR");
-             if (!env || !env[0])
-               env = "/tmp";
-          }
-     }
-
-   snprintf(buf, sizeof(buf), "%s/evas-cserve2-%x.socket", env, getuid());
-   /* FIXME: check we can actually create this socket */
-   strcpy(path, buf);
-#endif   
 }
 
 static int