diff --git a/status.c b/status.c
index c51878c5..828c714e 100644
--- a/status.c
+++ b/status.c
@@ -581,10 +581,6 @@ status_message_set(struct client *c, const char *fmt, ...)
 		free(msg);
 	}
 
-#ifdef TMATE
-	/* FIXME tmux: session can be NULL */
-#endif
-
 	delay = options_get_number(c->session->options, "display-time");
 	if (delay > 0) {
 		tv.tv_sec = delay / 1000;
diff --git a/window.c b/window.c
index f0e7b53e..8dd8243a 100644
--- a/window.c
+++ b/window.c
@@ -983,12 +983,6 @@ window_pane_read_callback(__unused struct bufferevent *bufev, void *data)
 
 	new_size = EVBUFFER_LENGTH(evb) - wp->pipe_off;
 	if (wp->pipe_fd != -1 && new_size > 0) {
-#ifdef TMATE
-		/* FIXME tmux:
-		 * - new_data
-		 * + new_data + wp->pipe_off;
-		 */
-#endif
 		new_data = EVBUFFER_DATA(evb);
 		bufferevent_write(wp->pipe_event, new_data, new_size);
 	}