diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
index aa6f32b4..3316e541 100644
--- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
+++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
@@ -20,8 +20,3 @@ Section "ServerLayout"
     Identifier     "Default Layout"
     Screen         "Default Screen"
 EndSection
-
-Section "ServerFlags"
-    Option        "DontZap"  "0"
-    Option        "AutoAddDevices"  "False"
-EndSection
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
index 662f60f3..52179631 100644
--- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
+++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
@@ -41,8 +41,3 @@ Section "ServerLayout"
    # InputDevice    "Keyboard0" "CoreKeyboard"
    # InputDevice    "DevInputMice" "SendCoreEvents"
 EndSection
-
-Section "ServerFlags"
-    Option        "DontZap"  "0"
-    Option        "AutoAddDevices"  "False"
-EndSection