diff --git a/cmd-new-window.c b/cmd-new-window.c
index ff116e9c..b7e0ef2c 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-window.c,v 1.13 2010/03/27 11:46:58 nicm Exp $ */
+/* $Id: cmd-new-window.c,v 1.45 2010-03-27 15:12:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
diff --git a/server-fn.c b/server-fn.c
index 30bc2bb1..aedd1374 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.102 2010-01-25 17:13:43 tcunha Exp $ */
+/* $Id: server-fn.c,v 1.103 2010-03-27 15:12:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,15 +42,6 @@ server_fill_environ(struct session *s, struct environ *env)
 	environ_set(env, "TERM", term);
 }
 
-void
-server_write_error(struct client *c, const char *msg)
-{
-	struct msg_print_data	printdata;
-
-	strlcpy(printdata.msg, msg, sizeof printdata.msg);
-	server_write_client(c, MSG_ERROR, &printdata, sizeof printdata);
-}
-
 void
 server_write_client(
     struct client *c, enum msgtype type, const void *buf, size_t len)
diff --git a/status.c b/status.c
index 1056bf59..41c269d6 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.144 2010-03-10 13:41:13 nicm Exp $ */
+/* $Id: status.c,v 1.145 2010-03-27 15:12:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -35,7 +35,6 @@ char   *status_redraw_get_right(
 	    struct client *, time_t, int, struct grid_cell *, size_t *);
 char   *status_job(struct client *, char **);
 void	status_job_callback(struct job *);
-size_t	status_width(struct client *, struct winlink *, time_t);
 char   *status_print(
 	    struct client *, struct winlink *, time_t, struct grid_cell *);
 void	status_replace1(struct client *,
@@ -560,30 +559,6 @@ status_job_callback(struct job *job)
 		job->data = xstrdup(line);
 }
 
-/* Calculate winlink status line entry width. */
-size_t
-status_width(struct client *c, struct winlink *wl, time_t t)
-{
-	struct options	*oo = &wl->window->options;
-	struct session	*s = c->session;
-	const char	*fmt;
-	char		*text;
-	size_t		 size;
-	int		 utf8flag;
-
-	utf8flag = options_get_number(&s->options, "status-utf8");
-
-	fmt = options_get_string(&wl->window->options, "window-status-format");
-	if (wl == s->curw)
-		fmt = options_get_string(oo, "window-status-current-format");
-
-	text = status_replace(c, wl, fmt, t, 1);
-	size = screen_write_cstrlen(utf8flag, "%s", text);
-	xfree(text);
-
-	return (size);
-}
-
 /* Return winlink status line entry and adjust gc as necessary. */
 char *
 status_print(
diff --git a/tmux.1 b/tmux.1
index 38314437..8ece29b8 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.160 2010/03/27 11:46:58 nicm Exp $
+.\" $Id: tmux.1,v 1.243 2010-03-27 15:12:56 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
diff --git a/tmux.h b/tmux.h
index 81c11aa6..2abb44f8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.550 2010-03-16 17:30:58 micahcowan Exp $ */
+/* $Id: tmux.h,v 1.551 2010-03-27 15:12:56 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1596,7 +1596,6 @@ void	 server_window_loop(void);
 
 /* server-fn.c */
 void	 server_fill_environ(struct session *, struct environ *);
-void	 server_write_error(struct client *, const char *);
 void	 server_write_client(
 	     struct client *, enum msgtype, const void *, size_t);
 void	 server_write_session(