diff --git a/fix_setuid b/fix_setuid
deleted file mode 100755
index 1a6dc58dc8..0000000000
--- a/fix_setuid
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-if test -z "$prefix"; then prefix=/nix; fi
-chown -Rf nix.nix $prefix/bin $prefix/etc $prefix/include $prefix/lib \
-  $prefix/libexec $prefix/man $prefix/share $prefix/var
-chown nix.nix $prefix/store
-chmod 6755 $prefix/bin/nix-env $prefix/bin/nix-instantiate $prefix/bin/nix-store
-chmod 775 $prefix/var/nix/manifests
-chmod 775 $prefix/var/nix/gcroots/tmp
-chmod 775 $prefix/var/nix/gcroots/channels
diff --git a/socket/Makefile b/socket/Makefile
deleted file mode 100644
index a9443f1c4b..0000000000
--- a/socket/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all: server client
-
-server: server.c
-	gcc -Wall -o server server.c
-
-client: client.c
-	gcc -Wall -o client client.c
diff --git a/socket/client.c b/socket/client.c
deleted file mode 100644
index a132a7a9ee..0000000000
--- a/socket/client.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-
-#define SOCKET_PATH "/tmp/nix-daemon"
-
-
-int main(int argc, char * * argv)
-{
-    int res;
-    
-    int sock = socket(PF_UNIX, SOCK_STREAM, 0);
-    assert(sock != -1);
-
-    struct sockaddr_un addr;
-    addr.sun_family = AF_UNIX;
-    strcpy(addr.sun_path, SOCKET_PATH);
-    
-    res = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
-    assert(res != -1);
-
-    int i;
-    for (i = 0; i < 100000; i++) {
-        int len = send(sock, &i, sizeof(i), 0);
-        assert(len == sizeof(i));
-
-        int j;
-        len = recv(sock, &j, sizeof(j), 0);
-        if (len < sizeof(j)) break;
-        assert(i * 2 == j);
-    }
-
-    close(sock);
-
-    return 0;
-}
diff --git a/socket/server.c b/socket/server.c
deleted file mode 100644
index 4e457ac216..0000000000
--- a/socket/server.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-
-#define SOCKET_PATH "/tmp/nix-daemon"
-
-
-int main(int argc, char * * argv)
-{
-    int res;
-    
-    int sock = socket(PF_UNIX, SOCK_STREAM, 0);
-    assert(sock != -1);
-
-    unlink(SOCKET_PATH);
-    
-    struct sockaddr_un addr;
-    addr.sun_family = AF_UNIX;
-    strcpy(addr.sun_path, SOCKET_PATH);
-    
-    res = bind(sock, (struct sockaddr *) &addr, sizeof(addr));
-    assert(res != -1);
-
-    res = listen(sock, 5);
-    if (res == -1)
-        fprintf(stderr, "%s\n", strerror(errno));
-    assert(res != -1);
-
-    while (1) {
-
-        struct sockaddr_un remoteAddr;
-        socklen_t remoteAddrLen = sizeof(remoteAddr);
-        
-        int remote = accept(sock,
-            (struct sockaddr *) &remoteAddr, &remoteAddrLen);
-        if (remote == -1)
-            fprintf(stderr, "%s\n", strerror(errno));
-        assert(remote != -1);
-
-        fprintf(stderr, "connection %d\n", remote);
-
-        while (1) {
-            int i;
-            ssize_t len;
-
-            len = recv(remote, &i, sizeof(i), 0);
-            if (len < sizeof(i)) break;
-
-            //            printf("%d\n", i);
-
-            int j = i * 2;
-            len = send(remote, &j, sizeof(j), 0);
-            if (len == -1)
-                fprintf(stderr, "%s\n", strerror(errno));
-            assert(len == sizeof(j));
-        }
-        
-        close(remote);
-    }
-    
-    close(sock);
-
-    return 0;
-}