diff --git a/daemon/peer.c b/daemon/peer.c
index 446e624ae..3899e7faf 100644
--- a/daemon/peer.c
+++ b/daemon/peer.c
@@ -949,13 +949,11 @@ static struct peer *new_peer(struct lightningd_state *dstate,
 	peer->commit_jsoncmd = NULL;
 	list_head_init(&peer->outgoing_txs);
 	list_head_init(&peer->pay_commands);
-	peer->close_watch_timeout = NULL;
 	peer->anchor.watches = NULL;
 	peer->cur_commit.watch = NULL;
 	peer->closing.their_sig = NULL;
 	peer->closing.our_script = NULL;
 	peer->closing.their_script = NULL;
-	peer->cleared = INPUT_NONE;
 	peer->closing_onchain.tx = NULL;
 	peer->closing_onchain.resolved = NULL;
 	peer->closing_onchain.ci = NULL;
diff --git a/daemon/peer.h b/daemon/peer.h
index 2b8651abe..08056c242 100644
--- a/daemon/peer.h
+++ b/daemon/peer.h
@@ -190,9 +190,6 @@ struct peer {
 		const struct bitcoin_tx **resolved;
 	} closing_onchain;
 	
-	/* If not INPUT_NONE, send this when we have no more HTLCs. */
-	enum state_input cleared;
-
 	/* Current ongoing packetflow */
 	struct io_data *io_data;
 	
@@ -205,9 +202,6 @@ struct peer {
 	/* Bitcoin transctions we're broadcasting (see chaintopology.c) */
 	struct list_head outgoing_txs;
 	
-	/* Timeout for close_watch. */
-	struct oneshot *close_watch_timeout;
-
 	/* Timeout for collecting changes before sending commit. */
 	struct oneshot *commit_timer;