diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c
index 2504bc5f..cc966f52 100644
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@@ -73,10 +73,6 @@ struct _EekKeyboardPrivate
     unsigned int old_level;
     GList *pressed_keys;
     GList *locked_keys;
-
-    /* modifiers dynamically assigned at run time */
-    EekModifierType num_lock_mask;
-    EekModifierType alt_gr_mask;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (EekKeyboard, eek_keyboard, EEK_TYPE_CONTAINER);
@@ -572,64 +568,6 @@ level_keyboard_get_outline (LevelKeyboard *keyboard,
     return &g_array_index (keyboard->outline_array, EekOutline, oref);
 }
 
-/**
- * eek_keyboard_set_num_lock_mask:
- * @keyboard: an #EekKeyboard
- * @num_lock_mask: an #EekModifierType
- *
- * Set modifier mask used as Num_Lock.
- */
-void
-eek_keyboard_set_num_lock_mask (EekKeyboard    *keyboard,
-                                EekModifierType num_lock_mask)
-{
-    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
-    keyboard->priv->num_lock_mask = num_lock_mask;
-}
-
-/**
- * eek_keyboard_get_num_lock_mask:
- * @keyboard: an #EekKeyboard
- *
- * Get modifier mask used as Num_Lock.
- * Returns: an #EekModifierType
- */
-EekModifierType
-eek_keyboard_get_num_lock_mask (EekKeyboard *keyboard)
-{
-    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
-    return keyboard->priv->num_lock_mask;
-}
-
-/**
- * eek_keyboard_set_alt_gr_mask:
- * @keyboard: an #EekKeyboard
- * @alt_gr_mask: an #EekModifierType
- *
- * Set modifier mask used as Alt_Gr.
- */
-void
-eek_keyboard_set_alt_gr_mask (EekKeyboard    *keyboard,
-                              EekModifierType alt_gr_mask)
-{
-    g_return_if_fail (EEK_IS_KEYBOARD(keyboard));
-    keyboard->priv->alt_gr_mask = alt_gr_mask;
-}
-
-/**
- * eek_keyboard_get_alt_gr_mask:
- * @keyboard: an #EekKeyboard
- *
- * Get modifier mask used as Alt_Gr.
- * Returns: an #EekModifierType
- */
-EekModifierType
-eek_keyboard_get_alt_gr_mask (EekKeyboard *keyboard)
-{
-    g_return_val_if_fail (EEK_IS_KEYBOARD(keyboard), 0);
-    return keyboard->priv->alt_gr_mask;
-}
-
 /**
  * eek_keyboard_get_pressed_keys:
  * @keyboard: an #EekKeyboard
diff --git a/eek/eek-keyboard.h b/eek/eek-keyboard.h
index 170c1324..18f965bf 100644
--- a/eek/eek-keyboard.h
+++ b/eek/eek-keyboard.h
@@ -169,18 +169,6 @@ EekKey             *eek_keyboard_find_key_by_name
 EekOutline         *level_keyboard_get_outline
                                      (LevelKeyboard        *keyboard,
                                       guint               oref);
-void                eek_keyboard_set_num_lock_mask
-                                     (EekKeyboard        *keyboard,
-                                      EekModifierType     num_lock_mask);
-EekModifierType     eek_keyboard_get_num_lock_mask
-                                     (EekKeyboard        *keyboard);
-
-void                eek_keyboard_set_alt_gr_mask
-                                     (EekKeyboard        *keyboard,
-                                      EekModifierType     alt_gr_mask);
-EekModifierType     eek_keyboard_get_alt_gr_mask
-                                     (EekKeyboard        *keyboard);
-
 GList              *eek_keyboard_get_pressed_keys
                                      (EekKeyboard        *keyboard);
 GList              *eek_keyboard_get_locked_keys
diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c
index 767816d1..219cac73 100644
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@@ -938,10 +938,6 @@ eek_xml_layout_real_create_keyboard (EekLayout *self,
 
     eek_layout_place_sections(keyboard, view);
 
-    /* Use pre-defined modifier mask here. */
-    eek_keyboard_set_num_lock_mask (view, EEK_MOD2_MASK);
-    eek_keyboard_set_alt_gr_mask (view, EEK_BUTTON1_MASK);
-
     return keyboard;
 }