diff --git a/window-more.c b/window-more.c
deleted file mode 100644
index 3c452267..00000000
--- a/window-more.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* $Id: window-more.c,v 1.42 2010-02-08 18:10:07 tcunha Exp $ */
-
-/*
- * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <string.h>
-
-#include "tmux.h"
-
-struct screen *window_more_init(struct window_pane *);
-void	window_more_free(struct window_pane *);
-void	window_more_resize(struct window_pane *, u_int, u_int);
-void	window_more_key(struct window_pane *, struct client *, int);
-
-void	window_more_redraw_screen(struct window_pane *);
-void	window_more_write_line(
-	    struct window_pane *, struct screen_write_ctx *, u_int);
-
-void	window_more_scroll_up(struct window_pane *);
-void	window_more_scroll_down(struct window_pane *);
-
-const struct window_mode window_more_mode = {
-	window_more_init,
-	window_more_free,
-	window_more_resize,
-	window_more_key,
-	NULL,
-	NULL,
-};
-
-struct window_more_mode_data {
-	struct screen	        screen;
-
-	struct mode_key_data	mdata;
-
-	ARRAY_DECL(, char *)	list;
-	u_int			top;
-};
-
-void
-window_more_add(struct window_pane *wp, const char *fmt, ...)
-{
-	va_list	ap;
-
-	va_start(ap, fmt);
-	window_more_vadd(wp, fmt, ap);
-	va_end(ap);
-}
-
-void
-window_more_vadd(struct window_pane *wp, const char *fmt, va_list ap)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	struct screen			*s = &data->screen;
-	struct screen_write_ctx	 	 ctx;
-	char   				*msg;
-	u_int				 size;
-
-	xvasprintf(&msg, fmt, ap);
-	ARRAY_ADD(&data->list, msg);
-
-	screen_write_start(&ctx, wp, NULL);
-	size = ARRAY_LENGTH(&data->list) - 1;
-	if (size >= data->top && size <= data->top + screen_size_y(s) - 1) {
-		window_more_write_line(wp, &ctx, size - data->top);
-		if (size != data->top)
-			window_more_write_line(wp, &ctx, 0);
-	} else
-		window_more_write_line(wp, &ctx, 0);
-	screen_write_stop(&ctx);
-}
-
-struct screen *
-window_more_init(struct window_pane *wp)
-{
-	struct window_more_mode_data	*data;
-	struct screen			*s;
-	int				 keys;
-
-	wp->modedata = data = xmalloc(sizeof *data);
-	ARRAY_INIT(&data->list);
-	data->top = 0;
-
-	s = &data->screen;
-	screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0);
-	s->mode &= ~MODE_CURSOR;
-
-	keys = options_get_number(&wp->window->options, "mode-keys");
-	if (keys == MODEKEY_EMACS)
-		mode_key_init(&data->mdata, &mode_key_tree_emacs_choice);
-	else
-		mode_key_init(&data->mdata, &mode_key_tree_vi_choice);
-
-	return (s);
-}
-
-void
-window_more_free(struct window_pane *wp)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	u_int				 i;
-
-	for (i = 0; i < ARRAY_LENGTH(&data->list); i++)
-		xfree(ARRAY_ITEM(&data->list, i));
-	ARRAY_FREE(&data->list);
-
-	screen_free(&data->screen);
-	xfree(data);
-}
-
-void
-window_more_resize(struct window_pane *wp, u_int sx, u_int sy)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	struct screen			*s = &data->screen;
-
-	screen_resize(s, sx, sy);
-	window_more_redraw_screen(wp);
-}
-
-/* ARGSUSED */
-void
-window_more_key(struct window_pane *wp, unused struct client *c, int key)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	struct screen			*s = &data->screen;
-
-	switch (mode_key_lookup(&data->mdata, key)) {
-	case MODEKEYCHOICE_CANCEL:
-		window_pane_reset_mode(wp);
-		break;
-	case MODEKEYCHOICE_UP:
-	case MODEKEYCHOICE_SCROLLUP:
-		window_more_scroll_up(wp);
-		break;
-	case MODEKEYCHOICE_DOWN:
-	case MODEKEYCHOICE_SCROLLDOWN:
-		window_more_scroll_down(wp);
-		break;
-	case MODEKEYCHOICE_PAGEUP:
-		if (data->top < screen_size_y(s))
-			data->top = 0;
-		else
-			data->top -= screen_size_y(s);
-		window_more_redraw_screen(wp);
-		break;
-	case MODEKEYCHOICE_PAGEDOWN:
-		if (data->top + screen_size_y(s) > ARRAY_LENGTH(&data->list))
-			data->top = ARRAY_LENGTH(&data->list);
-		else
-			data->top += screen_size_y(s);
-		window_more_redraw_screen(wp);
-		break;
-	default:
-		break;
-	}
-}
-
-void
-window_more_write_line(
-    struct window_pane *wp, struct screen_write_ctx *ctx, u_int py)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	struct screen			*s = &data->screen;
-	struct options			*oo = &wp->window->options;
-	struct grid_cell		 gc;
-	char   				*msg, hdr[32];
-	size_t	 			 size;
-	int				 utf8flag;
-
-	utf8flag = options_get_number(&wp->window->options, "utf8");
-	memcpy(&gc, &grid_default_cell, sizeof gc);
-
-	if (py == 0) {
-		size = xsnprintf(hdr, sizeof hdr,
-		    "[%u/%u]", data->top, ARRAY_LENGTH(&data->list));
-		screen_write_cursormove(ctx, screen_size_x(s) - size, 0);
-		colour_set_fg(&gc, options_get_number(oo, "mode-fg"));
-		colour_set_bg(&gc, options_get_number(oo, "mode-bg"));
-		gc.attr |= options_get_number(oo, "mode-attr");
-		screen_write_puts(ctx, &gc, "%s", hdr);
-		memcpy(&gc, &grid_default_cell, sizeof gc);
-	} else
-		size = 0;
-
-	screen_write_cursormove(ctx, 0, py);
-	if (data->top + py  < ARRAY_LENGTH(&data->list)) {
-		msg = ARRAY_ITEM(&data->list, data->top + py);
-		screen_write_nputs(
-		    ctx, screen_size_x(s) - size, &gc, utf8flag, "%s", msg);
-	}
-	while (s->cx < screen_size_x(s) - size)
-		screen_write_putc(ctx, &gc, ' ');
-}
-
-void
-window_more_redraw_screen(struct window_pane *wp)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	struct screen			*s = &data->screen;
-	struct screen_write_ctx	 	 ctx;
-	u_int				 i;
-
-	screen_write_start(&ctx, wp, NULL);
-	for (i = 0; i < screen_size_y(s); i++)
-		window_more_write_line(wp, &ctx, i);
-	screen_write_stop(&ctx);
-}
-
-void
-window_more_scroll_up(struct window_pane *wp)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	struct screen_write_ctx		 ctx;
-
-	if (data->top == 0)
-		return;
-	data->top--;
-
-	screen_write_start(&ctx, wp, NULL);
-	screen_write_cursormove(&ctx, 0, 0);
-	screen_write_insertline(&ctx, 1);
-	window_more_write_line(wp, &ctx, 0);
-	window_more_write_line(wp, &ctx, 1);
-	screen_write_stop(&ctx);
-}
-
-void
-window_more_scroll_down(struct window_pane *wp)
-{
-	struct window_more_mode_data	*data = wp->modedata;
-	struct screen			*s = &data->screen;
-	struct screen_write_ctx		 ctx;
-
-	if (data->top >= ARRAY_LENGTH(&data->list))
-		return;
-	data->top++;
-
-	screen_write_start(&ctx, wp, NULL);
-	screen_write_cursormove(&ctx, 0, 0);
-	screen_write_deleteline(&ctx, 1);
-	window_more_write_line(wp, &ctx, screen_size_y(s) - 1);
-	window_more_write_line(wp, &ctx, 0);
-	screen_write_stop(&ctx);
-}