diff --git a/sndiod/dsp.c b/sndiod/dsp.c
index fbce5fc..a7720c2 100644
--- a/sndiod/dsp.c
+++ b/sndiod/dsp.c
@@ -570,7 +570,7 @@ cmap_add(struct cmap *p, void *in, void *out, int vol, int todo)
 	istart = p->istart;
 	inext = p->inext;
 	nch = p->nch;
-	v = vol; /* XXX */
+	v = vol;
 
 	/*
 	 * map/mix input on the output
diff --git a/sndiod/midi.c b/sndiod/midi.c
index c5c7953..9871adb 100644
--- a/sndiod/midi.c
+++ b/sndiod/midi.c
@@ -14,12 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/*
- * TODO
- *
- * use shadow variables (to save NRPNs, LSB of controller) 
- * in the midi merger
- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -217,7 +211,7 @@ midi_tag(struct midi *ep, unsigned int tag)
 }
 
 /*
- * broadcast the given message to other members of the thru box
+ * broadcast the given message to other endpoints
  */
 void
 midi_send(struct midi *iep, unsigned char *msg, int size)
@@ -257,7 +251,6 @@ midi_send(struct midi *iep, unsigned char *msg, int size)
 	}
 }
 
-
 /*
  * determine if we have gained more input tickets, and if so call the
  * fill() call-back to notify the i/o layer that it can send more data
diff --git a/sndiod/sock.c b/sndiod/sock.c
index 9e78444..1940809 100644
--- a/sndiod/sock.c
+++ b/sndiod/sock.c
@@ -925,7 +925,6 @@ sock_hello(struct sock *f)
 	}
 	s->mix.maxweight = f->opt->maxweight;
 	s->dup = f->opt->dup;
-	/* XXX: must convert to slot rate */
 	f->slot = s;
 	return 1;
 }
@@ -1398,7 +1397,6 @@ sock_buildmsg(struct sock *f)
 	}
 
 	if (f->midi != NULL && f->midi->obuf.used > 0) {
-		/* XXX: use tickets */
 		size = f->midi->obuf.used;		
 		if (size > AMSG_DATAMAX)
 			size = AMSG_DATAMAX;
@@ -1518,7 +1516,6 @@ sock_read(struct sock *f)
 		f->wtodo = sizeof(struct amsg);
 		f->rstate = SOCK_RMSG;
 		f->rtodo = sizeof(struct amsg);
-		/* XXX: call sock_wmsg() ? */
 #ifdef DEBUG
 		if (log_level >= 4) {
 			sock_log(f);
@@ -1555,9 +1552,6 @@ sock_write(struct sock *f)
 			f->wtodo = 0xdeadbeef;
 			break;
 		}
-		/*
-		 * XXX: why not set f->wtodo in sock_wmsg() ?
-		 */
 		f->wstate = SOCK_WDATA;
 		f->wsize = f->wtodo = ntohl(f->wmsg.u.data.size);
 		/* PASSTHROUGH */