diff --git a/client.c b/client.c
index 594ec77..ae94c87 100644
--- a/client.c
+++ b/client.c
@@ -300,14 +300,6 @@ void shuffle(int up) {
     XMapRaised(dpy, c->parent);
     top(c);
     active(c);
-    if (zoom) {
-      quickreshape(
-        c,
-        -BORDER, 
-        -BORDER, 
-        ra.width + 2 * BORDER, 
-        ra.height + 2 * BORDER);
-    }
   } else {
     c = clients;
     for (l = &clients; *l; l = &(*l)->next)
diff --git a/config.h b/config.h
index 42494ef..749ecd3 100644
--- a/config.h
+++ b/config.h
@@ -60,7 +60,6 @@
 #define RESIZE_KEY XK_r
 #define DESTROY_KEY XK_d
 #define STICK_KEY XK_s
-#define ZOOM_KEY XK_z
 
 #define STICKYTOFRONT_KEY XK_t
 #define STICKYTOBACK_KEY XK_b
diff --git a/dat.h b/dat.h
index fd4ea2e..cd41513 100644
--- a/dat.h
+++ b/dat.h
@@ -157,7 +157,6 @@ extern int solidsweep;
 extern int numvirtuals;
 extern int scrolling;
 extern int ffm; /* focus follows mouse */
-extern int zoom;
 
 extern Atom exit_rio;
 extern Atom restart_rio;
diff --git a/key.c b/key.c
index 84189ab..6b9ae27 100644
--- a/key.c
+++ b/key.c
@@ -47,7 +47,6 @@ void keysetup(void) {
   int pcode = XKeysymToKeycode(dpy, SNAPTOPRIGHT_KEY);
   int ccode = XKeysymToKeycode(dpy, SNAPCENTER_KEY);
   int slcode = XKeysymToKeycode(dpy, LAUNCH_KEY);
-  int zcode = XKeysymToKeycode(dpy, ZOOM_KEY);
   int rightcode = XKeysymToKeycode(dpy, NEXTVIRT_KEY);
   int leftcode = XKeysymToKeycode(dpy, PREVVIRT_KEY);
 #ifdef DEVEL
@@ -224,14 +223,6 @@ void keysetup(void) {
       0,
       GrabModeSync,
       GrabModeAsync);
-    XGrabKey(
-      dpy,
-      zcode,
-      SHORTCUTMOD,
-      screens[i].root,
-      0,
-      GrabModeSync,
-      GrabModeAsync);
     XGrabKey(
       dpy,
       tabcode,
@@ -280,7 +271,6 @@ void keypress(XKeyEvent* e) {
   int scode = XKeysymToKeycode(dpy, STICK_KEY);
   int rcode = XKeysymToKeycode(dpy, RESIZE_KEY);
   int slcode = XKeysymToKeycode(dpy, LAUNCH_KEY);
-  int zcode = XKeysymToKeycode(dpy, ZOOM_KEY);
   int hcode = XKeysymToKeycode(dpy, SNAPLEFT_KEY);
   int lcode = XKeysymToKeycode(dpy, SNAPRIGHT_KEY);
   int jcode = XKeysymToKeycode(dpy, SNAPBOTTOM_KEY);
@@ -322,8 +312,6 @@ void keypress(XKeyEvent* e) {
       ra.height + 2 * BORDER);
   else if (e->keycode == scode && (e->state & SHORTCUTMOD) == (MODBITS))
     stick(current);
-  else if (e->keycode == zcode && (e->state & SHORTCUTMOD) == (MODBITS))
-    zoom = !zoom;
 
   /* half snap */
   else if (e->keycode == hcode && (e->state & SHORTCUTMOD) == (MODBITS))
diff --git a/main.c b/main.c
index c453ac3..d17c0d9 100644
--- a/main.c
+++ b/main.c
@@ -43,7 +43,6 @@ int solidsweep = 0;
 int numvirtuals = 0;
 int ffm = 0;
 int kbLaunch = 0;
-int zoom = 0;
 
 Atom exit_rio;
 Atom restart_rio;
diff --git a/manage.c b/manage.c
index 1648f1e..d710adb 100644
--- a/manage.c
+++ b/manage.c
@@ -219,16 +219,6 @@ int manage(Client* c, int mapped) {
     cmapfocus(current);
   c->init = 1;
 
-  /* If we are in zoom mode, spawn the window maximized */
-  if (zoom) {
-    quickreshape(
-      c,
-      -BORDER, 
-      -BORDER, 
-      ra.width + 2 * BORDER, 
-      ra.height + 2 * BORDER);
-  }
-
   /* If the window is out of bounds of the screen, try to wrangle it */
 
   /* If it's bigger than the screen, try to set it maximized */