diff --git a/cmd-select-prompt.c b/cmd-select-prompt.c
index e252ef88..8b1fb76b 100644
--- a/cmd-select-prompt.c
+++ b/cmd-select-prompt.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-select-prompt.c,v 1.3 2008-09-29 16:36:56 nicm Exp $ */
+/* $Id: cmd-select-prompt.c,v 1.4 2009-01-05 11:04:06 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -65,7 +65,6 @@ void
 cmd_select_prompt_callback(void *data, char *s)
 {
 	struct client	*c = data;
-	struct winlink	*wl;
 	const char	*errstr;
 	char		 msg[128];
 	u_int		 idx;
@@ -80,7 +79,7 @@ cmd_select_prompt_callback(void *data, char *s)
 		return;
 	}
 
-	if ((wl = winlink_find_by_index(&c->session->windows, idx)) == NULL) {
+	if (winlink_find_by_index(&c->session->windows, idx) == NULL) {
 		xsnprintf(msg, sizeof msg,
 		    "Window not found: %s:%d", c->session->name, idx);
 		server_set_client_message(c, msg);
diff --git a/grid-view.c b/grid-view.c
index ec484d68..839176b5 100644
--- a/grid-view.c
+++ b/grid-view.c
@@ -1,4 +1,4 @@
-/* $Id: grid-view.c,v 1.4 2008-12-11 17:06:28 nicm Exp $ */
+/* $Id: grid-view.c,v 1.5 2009-01-05 11:04:06 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -129,7 +129,6 @@ grid_view_insert_lines_region(
 	GRID_DEBUG(
 	    gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny);
 
-	rupper = grid_view_y(gd, rupper);
 	rlower = grid_view_y(gd, rlower);
 
 	py = grid_view_y(gd, py);
@@ -160,7 +159,6 @@ grid_view_delete_lines_region(
 	GRID_DEBUG(
 	    gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny);
 
-	rupper = grid_view_y(gd, rupper);
 	rlower = grid_view_y(gd, rlower);
 
 	py = grid_view_y(gd, py);
diff --git a/screen-write.c b/screen-write.c
index 633f02a9..f09c194c 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -1,4 +1,4 @@
-/* $Id: screen-write.c,v 1.17 2008-12-08 16:19:51 nicm Exp $ */
+/* $Id: screen-write.c,v 1.18 2009-01-05 11:04:06 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -489,10 +489,9 @@ void
 screen_write_clearstartofscreen(struct screen_write_ctx *ctx)
 {
 	struct screen	*s = ctx->s;
-	u_int		 sx, sy;
+	u_int		 sx;
 
 	sx = screen_size_x(s);
-	sy = screen_size_y(s);
 
 	if (s->cy > 0)
 		grid_view_clear(s->grid, 0, 0, sx, s->cy - 1);