diff --git a/src/bankd_client_fsm.c b/src/bankd_client_fsm.c
index 0e17b10..8cc773a 100644
--- a/src/bankd_client_fsm.c
+++ b/src/bankd_client_fsm.c
@@ -106,7 +106,7 @@
 	struct bankd_client *bc = (struct bankd_client *) fi->priv;
 	RsproPDU_t *pdu;
 
-	/* FIXME: Send ClientConnReq */
+	/* Send ClientConnReq */
 	pdu = rspro_gen_ConnectClientReq(&bc->srv_conn.own_comp_id, bc->srv_conn.clslot);
 	_bankd_conn_send_rspro(bc, pdu);
 }
diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c
index e35dea1..1527eff 100644
--- a/src/rspro_client_fsm.c
+++ b/src/rspro_client_fsm.c
@@ -311,7 +311,7 @@
 		osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2);
 		break;
 	case 1:
-		/* FIXME: close connection and re-start connection attempt */
+		/* close connection and re-start connection attempt */
 		ipa_client_conn_close(srvc->conn);
 		osmo_fsm_inst_dispatch(fi, SRVC_E_TCP_DOWN, NULL);
 		break;
diff --git a/src/server/rest_api.c b/src/server/rest_api.c
index a1c5718..b990664 100644
--- a/src/server/rest_api.c
+++ b/src/server/rest_api.c
@@ -331,7 +331,7 @@
 	llist_for_each_entry(conn, &srv->banks, list) {
 		if (conn->bank.bank_id == slotmap.bank.bank_id) {
 			slotmap_state_change(map, SLMAP_S_NEW, &conn->bank.maps_new);
-			/* FIXME: Notify the conn FSM about some new maps being available */
+			/* Notify the conn FSM about some new maps being available */
 			trigger_main_thread_via_eventfd();
 			break;
 		}