diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d7c430a1e4..378601db0c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -668,14 +668,6 @@ DISTRO_FEATURES ?= ""
 # This is used to limit what packages goes into images built, so set big by default
 ROOT_FLASH_SIZE ?= "256"
 
-MACHINE_GUI_CLASS ?= "smallscreen"
-# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead
-GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}"
-MACHINE_DISPLAY_WIDTH_PIXELS ?= "240"
-MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
-MACHINE_DISPLAY_ORIENTATION ?= "0"
-MACHINE_DISPLAY_BPP ?= "16"
-
 DISTRO_EXTRA_RDEPENDS ?= ""
 DISTRO_EXTRA_RRECOMMENDS ?= ""
 MACHINE_EXTRA_RDEPENDS ?= ""
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index bd409830e8..40723ebf71 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,5 @@
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"