diff --git a/channeld/channel.c b/channeld/channel.c
index 4d7d78f0d..a9d011547 100644
--- a/channeld/channel.c
+++ b/channeld/channel.c
@@ -1446,7 +1446,6 @@ static void handle_peer_fail_malformed_htlc(struct peer *peer, const u8 *msg)
 		fail = tal_arr(htlc, u8, 0);
 		towire_u16(&fail, failure_code);
 		towire_sha256(&fail, &sha256_of_onion);
-		/* FIXME: Make htlc->fail a u8 *! */
 		htlc->fail = fail;
 		start_commit_timer(peer);
 		return;
diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index 04ef22d62..63ab8b254 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -1434,7 +1434,6 @@ static enum watch_result funding_spent(struct peer *peer,
 	if (peer->local_shutdown_idx >= 0)
 		keyindex = peer->local_shutdown_idx;
 	else {
-		/* FIXME: Save to db */
 		keyindex = wallet_get_newindex(peer->ld);
 		if (keyindex < 0) {
 			log_broken(peer->log, "Could not get keyindex");
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index 593111e77..538cbe60d 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -983,7 +983,6 @@ void peer_sending_commitsig(struct peer *peer, const u8 *msg)
 				   num_local_added, maxid, peer->next_htlc_id);
 			return;
 		}
-		/* FIXME: Save to db */
 		peer->next_htlc_id += num_local_added;
 	}
 
@@ -1100,8 +1099,6 @@ void peer_got_commitsig(struct peer *peer, const u8 *msg)
 		  commitnum, feerate, tal_count(added), tal_count(fulfilled),
 		  tal_count(failed), tal_count(changed));
 
-	/* FIXME: store commit & htlc signature information. */
-
 	/* New HTLCs */
 	for (i = 0; i < tal_count(added); i++)
 		added_their_htlc(peer, &added[i], &shared_secrets[i]);
@@ -1227,8 +1224,6 @@ void peer_got_revoke(struct peer *peer, const u8 *msg)
 	/* FIXME: Check per_commitment_secret -> per_commit_point */
 	update_per_commit_point(peer, &next_per_commitment_point);
 
-	/* FIXME: Commit shachain and next_per_commit_point to db */
-
 	/* Tell it we've committed, and to go ahead with revoke. */
 	msg = towire_channel_got_revoke_reply(msg);
 	subd_send_msg(peer->owner, take(msg));