diff --git a/common/Makefile b/common/Makefile
index 44d02c1c2..2f5368ad6 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -47,7 +47,6 @@ COMMON_SRC_NOGEN :=				\
 	common/htlc_wire.c			\
 	common/initial_channel.c		\
 	common/initial_commit_tx.c		\
-	common/io_lock.c			\
 	common/iso4217.c			\
 	common/json.c				\
 	common/json_helpers.c			\
diff --git a/common/io_lock.c b/common/io_lock.c
deleted file mode 100644
index 05caaafbe..000000000
--- a/common/io_lock.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "config.h"
-#include <assert.h>
-#include <ccan/io/io_plan.h>
-#include <common/io_lock.h>
-
-struct io_lock {
-	bool locked;
-};
-
-/* Struct to hold information while we wait for the lock to be freed */
-struct io_lock_waiter {
-	struct io_plan *(*next)(struct io_conn *conn, void *next_arg);
-	void *arg;
-	struct io_lock *lock;
-	enum io_direction dir;
-};
-
-struct io_lock *io_lock_new(const tal_t *ctx)
-{
-	struct io_lock *lock = tal(ctx, struct io_lock);
-	lock->locked = false;
-	return lock;
-}
-
-static struct io_plan *io_lock_try_acquire(struct io_conn *conn,
-					   struct io_lock_waiter *waiter)
-{
-	/* Destructure waiter, since we might be freeing it below */
-	struct io_plan *(*next)(struct io_conn *, void *) = waiter->next;
-	void *next_arg = waiter->arg;
-
-	if (!waiter->lock->locked) {
-		waiter->lock->locked = true;
-		tal_free(waiter);
-		return next(conn, next_arg);
-	} else {
-		switch (waiter->dir) {
-		case IO_IN:
-			return io_wait(conn, waiter->lock, io_lock_try_acquire,
-				       waiter);
-		case IO_OUT:
-			return io_out_wait(conn, waiter->lock,
-					   io_lock_try_acquire, waiter);
-		}
-		/* Should not happen if waiter->dir is a valid enum
-		 * value */
-		abort();
-	}
-}
-
-static struct io_plan *io_lock_acquire_dir(
-    struct io_conn *conn, struct io_lock *lock, enum io_direction dir,
-    struct io_plan *(*next)(struct io_conn *, void *), void *arg)
-{
-	/* FIXME: We can avoid one allocation if we lock and call next here directly */
-	struct io_lock_waiter *waiter = tal(lock, struct io_lock_waiter);
-	waiter->next = next;
-	waiter->arg = arg;
-	waiter->lock = lock;
-	waiter->dir = dir;
-	return io_lock_try_acquire(conn, waiter);
-}
-
-struct io_plan *
-io_lock_acquire_out_(struct io_conn *conn, struct io_lock *lock,
-		 struct io_plan *(*next)(struct io_conn *, void *), void *arg)
-{
-	return io_lock_acquire_dir(conn, lock, IO_OUT, next, arg);
-}
-
-struct io_plan *
-io_lock_acquire_in_(struct io_conn *conn, struct io_lock *lock,
-		    struct io_plan *(*next)(struct io_conn *, void *), void *arg)
-{
-	return io_lock_acquire_dir(conn, lock, IO_IN, next, arg);
-}
-
-void io_lock_release(struct io_lock *lock)
-{
-	assert(lock->locked);
-	lock->locked = false;
-	io_wake(lock);
-}
-
-bool io_lock_taken(const struct io_lock *lock)
-{
-	return lock->locked;
-}
diff --git a/common/io_lock.h b/common/io_lock.h
deleted file mode 100644
index 03823c47d..000000000
--- a/common/io_lock.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef LIGHTNING_COMMON_IO_LOCK_H
-#define LIGHTNING_COMMON_IO_LOCK_H
-
-#include "config.h"
-#include <ccan/io/io.h>
-struct io_lock;
-
-/**
- * Create a new lock
- */
-struct io_lock *io_lock_new(const tal_t *ctx);
-
-/**
- * Acquire lock @lock before proceeding to @next
- *
- * Attempts to acquire the lock before proceeding with next. If the
- * lock is free this reduces to `io_always`, otherwise we put @conn in
- * wait until we get notified about the lock being released.
- */
-#define io_lock_acquire_out(conn, lock, next, arg)                             \
-	io_lock_acquire_out_((conn), (lock),                                   \
-			     typesafe_cb_preargs(struct io_plan *, void *,     \
-						 (next), (arg),                \
-						 struct io_conn *),            \
-			     (arg))
-
-struct io_plan *io_lock_acquire_out_(struct io_conn *conn, struct io_lock *lock,
-				     struct io_plan *(*next)(struct io_conn *,
-							     void *),
-				     void *arg);
-
-#define io_lock_acquire_in(conn, lock, next, arg)                             \
-	io_lock_acquire_in_((conn), (lock),				      \
-			    typesafe_cb_preargs(struct io_plan *, void *, \
-						(next), (arg),		\
-						struct io_conn *),	\
-			    (arg))
-
-struct io_plan *io_lock_acquire_in_(struct io_conn *conn, struct io_lock *lock,
-				    struct io_plan *(*next)(struct io_conn *,
-							    void *),
-				    void *arg);
-
-/**
- * Release the lock and notify waiters so they can proceed.
- */
-void io_lock_release(struct io_lock *lock);
-
-/**
- * Is this lock acquired?
- */
-bool io_lock_taken(const struct io_lock *lock);
-
-#endif /* LIGHTNING_COMMON_IO_LOCK_H */
diff --git a/common/test/run-lock.c b/common/test/run-lock.c
deleted file mode 100644
index 36e5323a9..000000000
--- a/common/test/run-lock.c
+++ /dev/null
@@ -1,227 +0,0 @@
-#include "config.h"
-#include "../io_lock.c"
-#include <common/amount.h>
-#include <common/setup.h>
-#include <common/utils.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <wire/wire.h>
-
-/* AUTOGENERATED MOCKS START */
-/* Generated stub for amount_asset_is_main */
-bool amount_asset_is_main(struct amount_asset *asset UNNEEDED)
-{ fprintf(stderr, "amount_asset_is_main called!\n"); abort(); }
-/* Generated stub for amount_asset_to_sat */
-struct amount_sat amount_asset_to_sat(struct amount_asset *asset UNNEEDED)
-{ fprintf(stderr, "amount_asset_to_sat called!\n"); abort(); }
-/* Generated stub for amount_sat */
-struct amount_sat amount_sat(u64 satoshis UNNEEDED)
-{ fprintf(stderr, "amount_sat called!\n"); abort(); }
-/* Generated stub for amount_sat_add */
- bool amount_sat_add(struct amount_sat *val UNNEEDED,
-				       struct amount_sat a UNNEEDED,
-				       struct amount_sat b UNNEEDED)
-{ fprintf(stderr, "amount_sat_add called!\n"); abort(); }
-/* Generated stub for amount_sat_eq */
-bool amount_sat_eq(struct amount_sat a UNNEEDED, struct amount_sat b UNNEEDED)
-{ fprintf(stderr, "amount_sat_eq called!\n"); abort(); }
-/* Generated stub for amount_sat_greater_eq */
-bool amount_sat_greater_eq(struct amount_sat a UNNEEDED, struct amount_sat b UNNEEDED)
-{ fprintf(stderr, "amount_sat_greater_eq called!\n"); abort(); }
-/* Generated stub for amount_sat_sub */
- bool amount_sat_sub(struct amount_sat *val UNNEEDED,
-				       struct amount_sat a UNNEEDED,
-				       struct amount_sat b UNNEEDED)
-{ fprintf(stderr, "amount_sat_sub called!\n"); abort(); }
-/* Generated stub for amount_sat_to_asset */
-struct amount_asset amount_sat_to_asset(struct amount_sat *sat UNNEEDED, const u8 *asset UNNEEDED)
-{ fprintf(stderr, "amount_sat_to_asset called!\n"); abort(); }
-/* Generated stub for amount_tx_fee */
-struct amount_sat amount_tx_fee(u32 fee_per_kw UNNEEDED, size_t weight UNNEEDED)
-{ fprintf(stderr, "amount_tx_fee called!\n"); abort(); }
-/* Generated stub for fromwire */
-const u8 *fromwire(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, void *copy UNNEEDED, size_t n UNNEEDED)
-{ fprintf(stderr, "fromwire called!\n"); abort(); }
-/* Generated stub for fromwire_amount_sat */
-struct amount_sat fromwire_amount_sat(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
-{ fprintf(stderr, "fromwire_amount_sat called!\n"); abort(); }
-/* Generated stub for fromwire_bool */
-bool fromwire_bool(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
-{ fprintf(stderr, "fromwire_bool called!\n"); abort(); }
-/* Generated stub for fromwire_fail */
-void *fromwire_fail(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
-{ fprintf(stderr, "fromwire_fail called!\n"); abort(); }
-/* Generated stub for fromwire_secp256k1_ecdsa_signature */
-void fromwire_secp256k1_ecdsa_signature(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
-					secp256k1_ecdsa_signature *signature UNNEEDED)
-{ fprintf(stderr, "fromwire_secp256k1_ecdsa_signature called!\n"); abort(); }
-/* Generated stub for fromwire_sha256 */
-void fromwire_sha256(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct sha256 *sha256 UNNEEDED)
-{ fprintf(stderr, "fromwire_sha256 called!\n"); abort(); }
-/* Generated stub for fromwire_tal_arrn */
-u8 *fromwire_tal_arrn(const tal_t *ctx UNNEEDED,
-		       const u8 **cursor UNNEEDED, size_t *max UNNEEDED, size_t num UNNEEDED)
-{ fprintf(stderr, "fromwire_tal_arrn called!\n"); abort(); }
-/* Generated stub for fromwire_u16 */
-u16 fromwire_u16(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
-{ fprintf(stderr, "fromwire_u16 called!\n"); abort(); }
-/* Generated stub for fromwire_u32 */
-u32 fromwire_u32(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
-{ fprintf(stderr, "fromwire_u32 called!\n"); abort(); }
-/* Generated stub for fromwire_u64 */
-u64 fromwire_u64(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
-{ fprintf(stderr, "fromwire_u64 called!\n"); abort(); }
-/* Generated stub for fromwire_u8 */
-u8 fromwire_u8(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
-{ fprintf(stderr, "fromwire_u8 called!\n"); abort(); }
-/* Generated stub for fromwire_u8_array */
-void fromwire_u8_array(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, u8 *arr UNNEEDED, size_t num UNNEEDED)
-{ fprintf(stderr, "fromwire_u8_array called!\n"); abort(); }
-/* Generated stub for towire */
-void towire(u8 **pptr UNNEEDED, const void *data UNNEEDED, size_t len UNNEEDED)
-{ fprintf(stderr, "towire called!\n"); abort(); }
-/* Generated stub for towire_amount_sat */
-void towire_amount_sat(u8 **pptr UNNEEDED, const struct amount_sat sat UNNEEDED)
-{ fprintf(stderr, "towire_amount_sat called!\n"); abort(); }
-/* Generated stub for towire_bool */
-void towire_bool(u8 **pptr UNNEEDED, bool v UNNEEDED)
-{ fprintf(stderr, "towire_bool called!\n"); abort(); }
-/* Generated stub for towire_secp256k1_ecdsa_signature */
-void towire_secp256k1_ecdsa_signature(u8 **pptr UNNEEDED,
-			      const secp256k1_ecdsa_signature *signature UNNEEDED)
-{ fprintf(stderr, "towire_secp256k1_ecdsa_signature called!\n"); abort(); }
-/* Generated stub for towire_sha256 */
-void towire_sha256(u8 **pptr UNNEEDED, const struct sha256 *sha256 UNNEEDED)
-{ fprintf(stderr, "towire_sha256 called!\n"); abort(); }
-/* Generated stub for towire_u16 */
-void towire_u16(u8 **pptr UNNEEDED, u16 v UNNEEDED)
-{ fprintf(stderr, "towire_u16 called!\n"); abort(); }
-/* Generated stub for towire_u32 */
-void towire_u32(u8 **pptr UNNEEDED, u32 v UNNEEDED)
-{ fprintf(stderr, "towire_u32 called!\n"); abort(); }
-/* Generated stub for towire_u64 */
-void towire_u64(u8 **pptr UNNEEDED, u64 v UNNEEDED)
-{ fprintf(stderr, "towire_u64 called!\n"); abort(); }
-/* Generated stub for towire_u8 */
-void towire_u8(u8 **pptr UNNEEDED, u8 v UNNEEDED)
-{ fprintf(stderr, "towire_u8 called!\n"); abort(); }
-/* Generated stub for towire_u8_array */
-void towire_u8_array(u8 **pptr UNNEEDED, const u8 *arr UNNEEDED, size_t num UNNEEDED)
-{ fprintf(stderr, "towire_u8_array called!\n"); abort(); }
-/* AUTOGENERATED MOCKS END */
-
-#define num_writers 10
-#define num_writes 10
-
-struct read_state {
-	int pos;
-
-	/* What have we read from the funnel end? Should be
-	 * num_writers sets of num_writes consecutive identical
-	 * numbers */
-	u8 reads[num_writers*num_writes];
-
-	/* All tasks reading from upstream writers will serialize on this */
-	struct io_lock *lock;
-};
-
-/* The read context per connection */
-struct reader_state {
-	struct read_state *read_state;
-
-	/* Where are we reading from? */
-	struct io_conn *upstream;
-	u8 buf;
-
-	int count;
-};
-
-struct write_state {
-	int count;
-	u8 id;
-};
-
-static struct io_plan *writer(struct io_conn *conn, struct write_state *ws)
-{
-	if (ws->count++ == num_writes)
-		return io_close(conn);
-	return io_write(conn, &ws->id, 1, writer, ws);
-}
-
-static struct io_plan *reader(struct io_conn *conn, struct reader_state *reader_state)
-{
-	struct read_state *rs = reader_state->read_state;
-	rs->reads[rs->pos] = reader_state->buf;
-	rs->pos++;
-	reader_state->count++;
-
-	if (reader_state->count == num_writes) {
-		io_lock_release(reader_state->read_state->lock);
-		return io_close(conn);
-	} else {
-		return io_read(conn, &reader_state->buf, 1, reader, reader_state);
-	}
-}
-
-static struct io_plan *reader_start(struct io_conn *conn, struct reader_state *reader_state)
-{
-	return io_read(conn, &reader_state->buf, 1, reader, reader_state);
-}
-
-static struct io_plan *reader_locked(struct io_conn *conn, struct reader_state *rs)
-{
-	return io_lock_acquire_in(conn, rs->read_state->lock, reader_start, rs);
-}
-
-/*
- * Creates a fan-in funnel from num_writers socketpairs into a single
- * reader
- *
- *   writers
- *    \\|//
- *   reader
- */
-static bool test_multi_write(const tal_t *ctx)
-{
-	struct write_state ws[num_writers];
-	struct read_state sink;
-	struct reader_state rs[num_writers];
-	int fds[2];
-
-	sink.pos = 0;
-	sink.lock = io_lock_new(ctx);
-	memset(&sink.reads, 0, sizeof(sink.reads));
-
-	for (size_t i=0; i<num_writers; i++) {
-		socketpair(AF_LOCAL, SOCK_STREAM, 0, fds);
-
-		rs[i].read_state = &sink;
-		rs[i].count = 0;
-		rs[i].buf = -1;
-
-		ws[i].id = (u8)(i+'a');
-		ws[i].count = 0;
-
-		rs[i].upstream = io_new_conn(ctx, fds[1], writer, &ws[i]);
-		io_new_conn(ctx, fds[0], reader_locked, &rs[i]);
-	}
-	io_loop(NULL, NULL);
-
-	/* Now check that we were serialized correctly, i.e., num_writers sets of num_writes identical numbers */
-	for (size_t i=0; i<num_writers; i++) {
-		for (size_t j=1; j<num_writes; j++)
-			if (sink.reads[i*num_writes+j] != sink.reads[i*num_writes+j-1])
-				return false;
-	}
-
-	return true;
-}
-
-int main(int argc, char *argv[])
-{
-	bool ok = true;
-	common_setup(argv[0]);
-	ok &= test_multi_write(tmpctx);
-	common_shutdown();
-	return !ok;
-}
diff --git a/lightningd/Makefile b/lightningd/Makefile
index f04bcf183..898b0b44c 100644
--- a/lightningd/Makefile
+++ b/lightningd/Makefile
@@ -100,7 +100,6 @@ LIGHTNINGD_COMMON_OBJS :=			\
 	common/htlc_wire.o			\
 	common/key_derive.o			\
 	common/keyset.o				\
-	common/io_lock.o			\
 	common/json.o				\
 	common/json_helpers.o			\
 	common/json_stream.o			\
diff --git a/lightningd/test/Makefile b/lightningd/test/Makefile
index c52f8c042..500e76df1 100644
--- a/lightningd/test/Makefile
+++ b/lightningd/test/Makefile
@@ -13,7 +13,6 @@ LIGHTNINGD_TEST_COMMON_OBJS :=			\
 	common/bech32.o				\
 	common/daemon_conn.o			\
 	common/htlc_state.o			\
-	common/io_lock.o			\
 	common/json.o				\
 	common/key_derive.o			\
 	common/pseudorand.o			\