diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2a5fca2..382cb22 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -5,19 +5,3 @@
 
 # same as x86 except HAL
 include device/generic/x86/BoardConfig.mk
-
-# Build OpenGLES emulation libraries
-BUILD_EMULATOR_OPENGL := true
-BUILD_EMULATOR_OPENGL_DRIVER := true
-
-# share the same one across all mini-emulators
-BOARD_EGL_CFG := device/generic/goldfish/opengl/system/egl/egl.cfg
-
-TARGET_USERIMAGES_USE_EXT4 := true
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 209715200
-BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_FLASH_BLOCK_SIZE := 512
-TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
-