diff --git a/include/textbox.h b/include/textbox.h
index 57084a24..70bd441b 100644
--- a/include/textbox.h
+++ b/include/textbox.h
@@ -31,14 +31,14 @@ typedef struct
 
 typedef enum
 {
-    TB_AUTOHEIGHT = 1 << 0,
-    TB_AUTOWIDTH  = 1 << 1,
-    TB_LEFT       = 1 << 16,
-    TB_RIGHT      = 1 << 17,
-    TB_CENTER     = 1 << 18,
-    TB_EDITABLE   = 1 << 19,
-    TB_MARKUP     = 1 << 20,
-    TB_WRAP       = 1 << 21,
+    TB_AUTOHEIGHT    = 1 << 0,
+        TB_AUTOWIDTH = 1 << 1,
+        TB_LEFT      = 1 << 16,
+        TB_RIGHT     = 1 << 17,
+        TB_CENTER    = 1 << 18,
+        TB_EDITABLE  = 1 << 19,
+        TB_MARKUP    = 1 << 20,
+        TB_WRAP      = 1 << 21,
 } TextboxFlags;
 
 typedef enum
diff --git a/source/x11-helper.c b/source/x11-helper.c
index 1c6bb738..920d25d6 100644
--- a/source/x11-helper.c
+++ b/source/x11-helper.c
@@ -420,21 +420,6 @@ static void x11_figure_out_numlock_mask ( Display *display )
     // Combined mask, without NumLock
     CombinedMask = ShiftMask | MetaLMask | MetaRMask | AltMask | AltRMask | SuperRMask | SuperLMask | HyperLMask | HyperRMask |
                    ControlMask;
-    if ( Mod1Mask != NumlockMask ) {
-        CombinedMask |= Mod1Mask;
-    }
-    if ( Mod2Mask != NumlockMask ) {
-        CombinedMask |= Mod2Mask;
-    }
-    if ( Mod3Mask != NumlockMask ) {
-        CombinedMask |= Mod3Mask;
-    }
-    if ( Mod4Mask != NumlockMask ) {
-        CombinedMask |= Mod4Mask;
-    }
-    if ( Mod5Mask != NumlockMask ) {
-        CombinedMask |= Mod5Mask;
-    }
     XFreeModifiermap ( modmap );
 }
 
@@ -498,21 +483,6 @@ void x11_parse_key ( char *combo, unsigned int *mod, KeySym *key )
             g_string_append_printf ( str, "X11 configured keyboard has no <b>HyperR</b> key.\n" );
         }
     }
-    if ( strcasestr ( combo, "mod1" ) ) {
-        modmask |= Mod1Mask;
-    }
-    if ( strcasestr ( combo, "mod2" ) ) {
-        modmask |= Mod2Mask;
-    }
-    if ( strcasestr ( combo, "mod3" ) ) {
-        modmask |= Mod3Mask;
-    }
-    if ( strcasestr ( combo, "mod4" ) ) {
-        modmask |= Mod4Mask;
-    }
-    if ( strcasestr ( combo, "mod5" ) ) {
-        modmask |= Mod5Mask;
-    }
 
     *mod = modmask;