diff --git a/cmd-clear-history.c b/cmd-clear-history.c
index 0a87b9b0..a9271346 100644
--- a/cmd-clear-history.c
+++ b/cmd-clear-history.c
@@ -41,11 +41,10 @@ int
 cmd_clear_history_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data	*data = self->data;
-	struct winlink		*wl;
 	struct window_pane	*wp;
 	struct grid		*gd;
 
-	if ((wl = cmd_find_pane(ctx, data->target, NULL, &wp)) == NULL)
+	if (cmd_find_pane(ctx, data->target, NULL, &wp) == NULL)
 		return (-1);
 	gd = wp->base.grid;
 
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 4516d2ca..a49e064a 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -72,7 +72,6 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	dst_w = dst_wl->window;
 
 	if (data->src == NULL) {
-		src_wl = dst_wl;
 		src_w = dst_w;
 		if (data->chflags & CMD_CHFLAG('D')) {
 			src_wp = TAILQ_NEXT(dst_wp, entry);