diff --git a/server-client.c b/server-client.c
index a678a122..a85561c3 100644
--- a/server-client.c
+++ b/server-client.c
@@ -344,7 +344,6 @@ server_client_handle_key(struct client *c, int key)
 	struct session		*s;
 	struct window		*w;
 	struct window_pane	*wp;
-	struct options		*oo;
 	struct timeval		 tv;
 	struct key_binding	*bd;
 	int		      	 xtimeout, isprefix;
@@ -363,7 +362,6 @@ server_client_handle_key(struct client *c, int key)
 
 	w = c->session->curw->window;
 	wp = w->active;
-	oo = &c->session->options;
 
 	/* Special case: number keys jump to pane in identify mode. */
 	if (c->flags & CLIENT_IDENTIFY && key >= '0' && key <= '9') {
diff --git a/tty.c b/tty.c
index 1c0c7a6b..e6cb3543 100644
--- a/tty.c
+++ b/tty.c
@@ -668,7 +668,6 @@ tty_write(
 	struct window_pane	*wp = ctx->wp;
 	struct client		*c;
 	struct session		*s;
-	struct options		*oo;
 	u_int		 	 i;
 
 	/* wp can be NULL if updating the screen but not the terminal. */
@@ -693,7 +692,6 @@ tty_write(
 				continue;
 			if (c->tty.flags & TTY_FREEZE)
 				continue;
-			oo = &s->options;
 
 			ctx->xoff = wp->xoff;
 			ctx->yoff = wp->yoff;