diff --git a/source3/include/ctdb_packet.h b/source3/include/ctdb_packet.h
deleted file mode 100644
index 026b23f90e4..00000000000
--- a/source3/include/ctdb_packet.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   CTDB Packet handling
-   Copyright (C) Volker Lendecke 2007
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * A ctdb_packet context is a wrapper around a bidirectional file descriptor,
- * hiding the handling of individual requests.
- */
-
-struct ctdb_packet_context;
-
-/*
- * Initialize a ctdb_packet context. The fd is given to the ctdb_packet context, meaning
- * that it is automatically closed when the ctdb_packet context is freed.
- */
-struct ctdb_packet_context *ctdb_packet_init(TALLOC_CTX *mem_ctx, int fd);
-
-/*
- * Pull data from the fd
- */
-NTSTATUS ctdb_packet_fd_read(struct ctdb_packet_context *ctx);
-
-/*
- * Sync read, wait for the next chunk
- */
-NTSTATUS ctdb_packet_fd_read_sync_timeout(struct ctdb_packet_context *ctx, int timeout);
-
-/*
- * Handle an incoming ctdb_packet:
- * Return False if none is available
- * Otherwise return True and store the callback result in *status
- * Callback must either talloc_move or talloc_free buf
- */
-bool ctdb_packet_handler(struct ctdb_packet_context *ctx,
-		    bool (*full_req)(const uint8_t *buf,
-				     size_t available,
-				     size_t *length,
-				     void *private_data),
-		    NTSTATUS (*callback)(uint8_t *buf, size_t length,
-					 void *private_data),
-		    void *private_data,
-		    NTSTATUS *status);
-
-/*
- * How many bytes of outgoing data do we have pending?
- */
-size_t ctdb_packet_outgoing_bytes(struct ctdb_packet_context *ctx);
-
-/*
- * Push data to the fd
- */
-NTSTATUS ctdb_packet_fd_write(struct ctdb_packet_context *ctx);
-
-/*
- * Sync flush all outgoing bytes
- */
-NTSTATUS ctdb_packet_flush(struct ctdb_packet_context *ctx);
-
-/*
- * Send a list of DATA_BLOBs
- *
- * Example:  ctdb_packet_send(ctx, 2, data_blob_const(&size, sizeof(size)),
- *			 data_blob_const(buf, size));
- */
-NTSTATUS ctdb_packet_send(struct ctdb_packet_context *ctx, int num_blobs, ...);
-
-/*
- * Get the ctdb_packet context's file descriptor
- */
-int ctdb_packet_get_fd(struct ctdb_packet_context *ctx);
diff --git a/source3/lib/ctdb_packet.c b/source3/lib/ctdb_packet.c
deleted file mode 100644
index 5ea1c255da9..00000000000
--- a/source3/lib/ctdb_packet.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   CTDB Packet handling
-   Copyright (C) Volker Lendecke 2007
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "../lib/util/select.h"
-#include "system/filesys.h"
-#include "ctdb_packet.h"
-
-struct ctdb_packet_context {
-	int fd;
-	DATA_BLOB in, out;
-};
-
-/*
- * Close the underlying fd
- */
-static int ctdb_packet_context_destructor(struct ctdb_packet_context *ctx)
-{
-	return close(ctx->fd);
-}
-
-/*
- * Initialize a ctdb_packet context. The fd is given to the ctdb_packet context, meaning
- * that it is automatically closed when the ctdb_packet context is freed.
- */
-struct ctdb_packet_context *ctdb_packet_init(TALLOC_CTX *mem_ctx, int fd)
-{
-	struct ctdb_packet_context *result;
-
-	if (!(result = talloc_zero(mem_ctx, struct ctdb_packet_context))) {
-		return NULL;
-	}
-
-	result->fd = fd;
-	talloc_set_destructor(result, ctdb_packet_context_destructor);
-	return result;
-}
-
-/*
- * Pull data from the fd
- */
-NTSTATUS ctdb_packet_fd_read(struct ctdb_packet_context *ctx)
-{
-	int res, available;
-	size_t new_size;
-	uint8 *in;
-
-	res = ioctl(ctx->fd, FIONREAD, &available);
-
-	if (res == -1) {
-		DEBUG(10, ("ioctl(FIONREAD) failed: %s\n", strerror(errno)));
-		return map_nt_error_from_unix(errno);
-	}
-
-	SMB_ASSERT(available >= 0);
-
-	if (available == 0) {
-		return NT_STATUS_END_OF_FILE;
-	}
-
-	new_size = ctx->in.length + available;
-
-	if (new_size < ctx->in.length) {
-		DEBUG(0, ("integer wrap\n"));
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	if (!(in = talloc_realloc(ctx, ctx->in.data, uint8, new_size))) {
-		DEBUG(10, ("talloc failed\n"));
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	ctx->in.data = in;
-
-	res = recv(ctx->fd, in + ctx->in.length, available, 0);
-
-	if (res < 0) {
-		DEBUG(10, ("recv failed: %s\n", strerror(errno)));
-		return map_nt_error_from_unix(errno);
-	}
-
-	if (res == 0) {
-		return NT_STATUS_END_OF_FILE;
-	}
-
-	ctx->in.length += res;
-
-	return NT_STATUS_OK;
-}
-
-NTSTATUS ctdb_packet_fd_read_sync_timeout(struct ctdb_packet_context *ctx, int timeout)
-{
-	int res, revents;
-
-	res = poll_one_fd(ctx->fd, POLLIN|POLLHUP, timeout, &revents);
-	if (res == 0) {
-		DEBUG(10, ("poll timed out\n"));
-		return NT_STATUS_IO_TIMEOUT;
-	}
-
-	if (res == -1) {
-		DEBUG(10, ("poll returned %s\n", strerror(errno)));
-		return map_nt_error_from_unix(errno);
-	}
-	if ((revents & (POLLIN|POLLHUP|POLLERR)) == 0) {
-		DEBUG(10, ("socket not readable\n"));
-		return NT_STATUS_IO_TIMEOUT;
-	}
-
-	return ctdb_packet_fd_read(ctx);
-}
-
-bool ctdb_packet_handler(struct ctdb_packet_context *ctx,
-		    bool (*full_req)(const uint8_t *buf,
-				     size_t available,
-				     size_t *length,
-				     void *priv),
-		    NTSTATUS (*callback)(uint8_t *buf, size_t length,
-					 void *priv),
-		    void *priv, NTSTATUS *status)
-{
-	size_t length;
-	uint8_t *buf;
-
-	if (!full_req(ctx->in.data, ctx->in.length, &length, priv)) {
-		return False;
-	}
-
-	if (length > ctx->in.length) {
-		*status = NT_STATUS_INTERNAL_ERROR;
-		return true;
-	}
-
-	if (length == ctx->in.length) {
-		buf = ctx->in.data;
-		ctx->in.data = NULL;
-		ctx->in.length = 0;
-	} else {
-		buf = (uint8_t *)talloc_memdup(ctx, ctx->in.data, length);
-		if (buf == NULL) {
-			*status = NT_STATUS_NO_MEMORY;
-			return true;
-		}
-
-		memmove(ctx->in.data, ctx->in.data + length,
-			ctx->in.length - length);
-		ctx->in.length -= length;
-	}
-
-	*status = callback(buf, length, priv);
-	return True;
-}
-
-/*
- * How many bytes of outgoing data do we have pending?
- */
-size_t ctdb_packet_outgoing_bytes(struct ctdb_packet_context *ctx)
-{
-	return ctx->out.length;
-}
-
-/*
- * Push data to the fd
- */
-NTSTATUS ctdb_packet_fd_write(struct ctdb_packet_context *ctx)
-{
-	ssize_t sent;
-
-	sent = sys_send(ctx->fd, ctx->out.data, ctx->out.length, 0);
-
-	if (sent == -1) {
-		DEBUG(0, ("send failed: %s\n", strerror(errno)));
-		return map_nt_error_from_unix(errno);
-	}
-
-	memmove(ctx->out.data, ctx->out.data + sent,
-		ctx->out.length - sent);
-	ctx->out.length -= sent;
-
-	return NT_STATUS_OK;
-}
-
-/*
- * Sync flush all outgoing bytes
- */
-NTSTATUS ctdb_packet_flush(struct ctdb_packet_context *ctx)
-{
-	while (ctx->out.length != 0) {
-		NTSTATUS status = ctdb_packet_fd_write(ctx);
-		if (!NT_STATUS_IS_OK(status)) {
-			return status;
-		}
-	}
-	return NT_STATUS_OK;
-}
-
-/*
- * Send a list of DATA_BLOBs
- *
- * Example:  ctdb_packet_send(ctx, 2, data_blob_const(&size, sizeof(size)),
- *			 data_blob_const(buf, size));
- */
-NTSTATUS ctdb_packet_send(struct ctdb_packet_context *ctx, int num_blobs, ...)
-{
-	va_list ap;
-	int i;
-	size_t len;
-	uint8 *out;
-
-	len = ctx->out.length;
-
-	va_start(ap, num_blobs);
-	for (i=0; i<num_blobs; i++) {
-		size_t tmp;
-		DATA_BLOB blob = va_arg(ap, DATA_BLOB);
-
-		tmp = len + blob.length;
-		if (tmp < len) {
-			DEBUG(0, ("integer overflow\n"));
-			va_end(ap);
-			return NT_STATUS_NO_MEMORY;
-		}
-		len = tmp;
-	}
-	va_end(ap);
-
-	if (len == 0) {
-		return NT_STATUS_OK;
-	}
-
-	if (!(out = talloc_realloc(ctx, ctx->out.data, uint8, len))) {
-		DEBUG(0, ("talloc failed\n"));
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	ctx->out.data = out;
-
-	va_start(ap, num_blobs);
-	for (i=0; i<num_blobs; i++) {
-		DATA_BLOB blob = va_arg(ap, DATA_BLOB);
-
-		memcpy(ctx->out.data+ctx->out.length, blob.data, blob.length);
-		ctx->out.length += blob.length;
-	}
-	va_end(ap);
-
-	SMB_ASSERT(ctx->out.length == len);
-	return NT_STATUS_OK;
-}
-
-/*
- * Get the ctdb_packet context's file descriptor
- */
-int ctdb_packet_get_fd(struct ctdb_packet_context *ctx)
-{
-	return ctx->fd;
-}
diff --git a/source3/wscript_build b/source3/wscript_build
index 38f0d12ef62..d6550b0104e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -278,7 +278,6 @@ if bld.CONFIG_GET("CTDB_CFLAGS") and bld.CONFIG_GET("CTDB_INCLUDE"):
                      lib/cluster_support.c
                      lib/dbwrap/dbwrap_ctdb.c
                      lib/messages_ctdbd.c
-                     lib/ctdb_packet.c
                      lib/ctdbd_conn.c
                      lib/ctdb_conn.c
                      torture/test_ctdbconn.c