diff --git a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev
index 1c95c2d..ff028ba 100644
--- a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev
+++ b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev
@@ -7,22 +7,6 @@
     Option	"standby time"	"0"
     Option	"suspend time"	"0"
     Option	"off time"	"0"
-    Option	"AllowEmptyInput"	"False" 
-    Option	"AutoAddDevices"	"False" 
-    Option	"AutoEnableDevices"	"False" 
-EndSection
-
-Section "InputDevice"
-    Identifier	"Keyboard1"
-    Driver	"kbd"
-    Option	"AutoRepeat"	"500 5"
-EndSection
-
-Section "InputDevice"
-    Identifier	"Mouse1"
-    Driver	"mouse"
-    Option	"Protocol"	"Auto"
-    Option	"Device"	"/dev/input/mice"
 EndSection
 
 Section "Monitor"
@@ -86,6 +70,4 @@
 Section "ServerLayout"
     Identifier	"Framebuffer"
     Screen	"Screen Framebuffer"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice	"Keyboard1" "CoreKeyboard"
 EndSection
diff --git a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles
index cfffe65..0ac620f 100644
--- a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles
+++ b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles
@@ -8,22 +8,6 @@
     Option	"standby time"	"0"
     Option	"suspend time"	"0"
     Option	"off time"	"0"
-    Option	"AllowEmptyInput"	"False" 
-    Option	"AutoAddDevices"	"False" 
-    Option	"AutoEnableDevices"	"False" 
-EndSection
-
-Section "InputDevice"
-    Identifier	"Keyboard1"
-    Driver	"kbd"
-    Option	"AutoRepeat"	"500 5"
-EndSection
-
-Section "InputDevice"
-    Identifier	"Mouse1"
-    Driver	"mouse"
-    Option	"Protocol"	"Auto"
-    Option	"Device"	"/dev/input/mice"
 EndSection
 
 Section "InputDevice"
@@ -137,16 +121,12 @@
 Section "ServerLayout"
     Identifier	"Internal"
     Screen	"Screen Internal"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
     InputDevice	"mxt_touch"
 EndSection
 
 Section "ServerLayout"
     Identifier	"HDMI"
     Screen	"Screen HDMI"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
     InputDevice	"mxt_touch"
 EndSection
 
@@ -154,15 +134,11 @@
     Identifier	"DualView"
     Screen	"Screen Internal"
     Screen	"Screen HDMI" RightOf "Screen Internal"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
     InputDevice	"mxt_touch"
 EndSection
 
 Section "ServerLayout"
     Identifier	"Mirror"
     Screen	"Screen Mirror"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
     InputDevice	"mxt_touch"
 EndSection
diff --git a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch
index 1a8c58c..1bd6561 100644
--- a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch
+++ b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch
@@ -8,22 +8,6 @@
     Option	"standby time"	"0"
     Option	"suspend time"	"0"
     Option	"off time"	"0"
-    Option	"AllowEmptyInput"	"False" 
-    Option	"AutoAddDevices"	"True"
-    Option	"AutoEnableDevices"	"True"
-EndSection
-
-Section "InputDevice"
-    Identifier	"Keyboard1"
-    Driver	"kbd"
-    Option	"AutoRepeat"	"500 5"
-EndSection
-
-Section "InputDevice"
-    Identifier	"Mouse1"
-    Driver	"mouse"
-    Option	"Protocol"	"Auto"
-    Option	"Device"	"/dev/input/mice"
 EndSection
 
 Section "InputClass"
@@ -138,28 +122,20 @@
 Section "ServerLayout"
     Identifier	"Internal"
     Screen	"Screen Internal"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
 EndSection
 
 Section "ServerLayout"
     Identifier	"HDMI"
     Screen	"Screen HDMI"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
 EndSection
 
 Section "ServerLayout"
     Identifier	"DualView"
     Screen	"Screen Internal"
     Screen	"Screen HDMI" RightOf "Screen Internal"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
 EndSection
 
 Section "ServerLayout"
     Identifier	"Mirror"
     Screen	"Screen Mirror"
-    InputDevice	"Mouse1" "CorePointer"
-    InputDevice "Keyboard1" "CoreKeyboard"
 EndSection