diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index cfa8cbb..fabcfb7 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -79,9 +79,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := ./device/samsung/galaxys2-common/releasetools/
 BOARD_HARDWARE_CLASS := hardware/samsung/cmhw
 
 # Graphics
-BOARD_EGL_CFG := device/samsung/galaxys2-common/configs/egl.cfg
-BOARD_EGL_NEEDS_HANDLE_VALUE := true
-USE_OPENGL_RENDERER := true
+USE_OPENGL_RENDERER := false
 TARGET_REQUIRES_SYNCHRONOUS_SETSURFACE := true
 COMMON_GLOBAL_CFLAGS += -DFORCE_SCREENSHOT_CPU_PATH -DWORKAROUND_BUG_10194508
 
diff --git a/common.mk b/common.mk
index 2f184e6..91c2aa4 100644
--- a/common.mk
+++ b/common.mk
@@ -77,7 +77,6 @@ PRODUCT_PACKAGES += \
 # HAL
 PRODUCT_PACKAGES += \
     camera.smdk4210 \
-    gralloc.exynos4 \
     hwcomposer.exynos4 \
     libnetcmdiface \
     lights.exynos4 \
@@ -143,18 +142,6 @@ PRODUCT_PACKAGES += \
     fsck.f2fs \
     mkfs.f2fs
 
-# Live Wallpapers
-PRODUCT_PACKAGES += \
-    Galaxy4 \
-    HoloSpiralWallpaper \
-    LiveWallpapers \
-    LiveWallpapersPicker \
-    MagicSmokeWallpapers \
-    NoiseField \
-    PhaseBeam \
-    VisualizationWallpapers \
-    librs_jni
-
 # Wifi
 PRODUCT_PACKAGES += \
     dhcpcd.conf \
@@ -190,10 +177,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
 
-# Feature live wallpaper
-PRODUCT_COPY_FILES += \
-    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
-
 PRODUCT_TAGS += dalvik.gc.type-precise
 
 # Keylayouts