diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf
deleted file mode 100644
index da4fc3c6..00000000
--- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-Section "Device"
-    Identifier	"Generic VESA"
-    Driver	"vesa"
-EndSection
-
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
-EndSection
-
-Section "Screen"
-    Identifier    "Default Screen"
-    Device	  "Generic VESA"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen         "Default Screen"
-EndSection
-
-Section "ServerFlags"
-    Option        "DontZap"  "0"
-    Option        "AutoAddDevices"  "False"
-EndSection
diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
index 73736aca..5266117b 100644
--- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
+++ b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
@@ -41,8 +41,3 @@ Section "ServerLayout"
    # InputDevice    "Keyboard0" "CoreKeyboard"
    # InputDevice    "DevInputMice" "SendCoreEvents"
 EndSection
-
-Section "ServerFlags"
-    Option        "DontZap"  "0"
-    Option        "AutoAddDevices"  "False"
-EndSection