diff --git a/README.md b/README.md
index 6258605..ad83aee 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ Patches
 - movestack
 - status bar on all monitors (personal)
 - sticky
-- swap focus
 - warp mouse to center of focussed window
 - scratchpads
 
diff --git a/dwm.c b/dwm.c
index 5aba3fd..4e8fc13 100644
--- a/dwm.c
+++ b/dwm.c
@@ -211,7 +211,6 @@ static void seturgent(Client *c, int urg);
 static void showhide(Client *c);
 static void sigchld(int unused);
 static void spawn(const Arg *arg);
-static void swapfocus();
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
 static void tile(Monitor *);
@@ -249,7 +248,6 @@ static void centeredmaster(Monitor *m);
 static void centeredfloatingmaster(Monitor *m);
 
 /* variables */
-static Client *prevclient = NULL;
 static const char broken[] = "broken";
 static char stext[256];
 static int screen;
@@ -1716,17 +1714,6 @@ spawn(const Arg *arg)
 	}
 }
 
-void
-swapfocus()
-{
-	Client *c;
-	for(c = selmon->clients; c && c != prevclient; c = c->next) ;
-	if(c == prevclient) {
-		focus(prevclient);
-		restack(prevclient->mon);
-	}
-}
-
 void
 tag(const Arg *arg)
 {
@@ -1870,7 +1857,6 @@ unfocus(Client *c, int setfocus)
 {
 	if (!c)
 		return;
-	prevclient = c;
 	grabbuttons(c, 0);
 	XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
 	if (setfocus) {
@@ -2259,13 +2245,12 @@ void
 zoom(const Arg *arg)
 {
 	Client *c = selmon->sel;
-	prevclient = nexttiled(selmon->clients);
 
 	if (!selmon->lt[selmon->sellt]->arrange
 	|| (selmon->sel && selmon->sel->isfloating))
 		return;
 	if (c == nexttiled(selmon->clients))
-		if (!c || !(c = prevclient = nexttiled(c->next)))
+		if (!c || !(c = nexttiled(c->next)))
 			return;
 	pop(c);
 }
diff --git a/patches/dwm-swapfocus-20160731-56a31dc.diff b/patches/dwm-swapfocus-20160731-56a31dc.diff
deleted file mode 100644
index 65a86d9..0000000
--- a/patches/dwm-swapfocus-20160731-56a31dc.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Author: Jan Christoph Ebersbach <jceb@e-jc.de>
-URL: http://dwm.suckless.org/patches/swapfocus
-This patch makes it possible to switch focus with one single shortcut (alt-s)
-instead of having to think if you should use alt-j or alt-k for reaching the
-last used window.
-
-Index: dwm/dwm.c
-===================================================================
---- dwm/dwm.c.orig
-+++ dwm/dwm.c
-@@ -207,6 +207,7 @@ static void setup(void);
- static void showhide(Client *c);
- static void sigchld(int unused);
- static void spawn(const Arg *arg);
-+static void swapfocus();
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
- static void tile(Monitor *);
-@@ -236,6 +237,7 @@ static int xerrorstart(Display *dpy, XEr
- static void zoom(const Arg *arg);
- 
- /* variables */
-+static Client *prevclient = NULL;
- static const char broken[] = "broken";
- static char stext[256];
- static int screen;
-@@ -1645,6 +1647,17 @@ spawn(const Arg *arg)
- }
- 
- void
-+swapfocus()
-+{
-+	Client *c;
-+	for(c = selmon->clients; c && c != prevclient; c = c->next) ;
-+	if(c == prevclient) {
-+		focus(prevclient);
-+		restack(prevclient->mon);
-+	}
-+}
-+
-+void
- tag(const Arg *arg)
- {
- 	if (selmon->sel && arg->ui & TAGMASK) {
-@@ -1743,6 +1756,7 @@ unfocus(Client *c, int setfocus)
- {
- 	if (!c)
- 		return;
-+	prevclient = c;
- 	grabbuttons(c, 0);
- 	XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
- 	if (setfocus) {
-@@ -2109,12 +2123,13 @@ void
- zoom(const Arg *arg)
- {
- 	Client *c = selmon->sel;
-+	prevclient = nexttiled(selmon->clients);
- 
- 	if (!selmon->lt[selmon->sellt]->arrange
- 	|| (selmon->sel && selmon->sel->isfloating))
- 		return;
- 	if (c == nexttiled(selmon->clients))
--		if (!c || !(c = nexttiled(c->next)))
-+		if (!c || !(c = prevclient = nexttiled(c->next)))
- 			return;
- 	pop(c);
- }