diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index 151c2b7..72eb4c0 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -35,7 +35,6 @@ BOARD_USES_SKTEXTBOX := true
 ifdef EXYNOS4210_ENHANCEMENTS
 COMMON_GLOBAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS
 COMMON_GLOBAL_CFLAGS += -DEXYNOS4210_ENHANCEMENTS
-COMMON_GLOBAL_CFLAGS += -DSURFACEFLINGER_FORCE_SCREEN_RELEASE
 endif
 
 TARGET_BOARD_PLATFORM := exynos4
@@ -55,8 +54,8 @@ BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_BASE := 0x40000000
 BOARD_KERNEL_CMDLINE := console=ttySAC2,115200 consoleblank=0
 
-#Use old kernel toolchain.  GCC 4.6 may be the root cause of our modem
-#interface dying all the time.
+# Use old kernel toolchain.  GCC 4.6 may be the root cause of our modem
+# interface dying all the time.
 TARGET_KERNEL_CUSTOM_TOOLCHAIN := arm-eabi-4.4.3
 
 # Filesystem
@@ -85,8 +84,6 @@ BOARD_USES_FIMGAPI := true
 # OMX
 BOARD_USE_SAMSUNG_COLORFORMAT := true
 BOARD_FIX_NATIVE_COLOR_FORMAT := true
-BOARD_HAVE_CODEC_SUPPORT := SAMSUNG_CODEC_SUPPORT
-COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CODEC_SUPPORT
 BOARD_NONBLOCK_MODE_PROCESS := true
 BOARD_USE_STOREMETADATA := true
 BOARD_USE_METADATABUFFERTYPE := true
@@ -106,7 +103,6 @@ BOARD_USES_PROPRIETARY_LIBCAMERA := true
 BOARD_USES_PROPRIETARY_LIBFIMC := true
 COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK
 COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE
-DISABLE_HW_ID_MATCH_CHECK :=true 
 
 # Wifi
 BOARD_WLAN_DEVICE                := bcmdhd