gta4xl-common: cleanup properties

Change-Id: I47e6ad50462ff8dc87097104d84f4de3a1f355b6
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 918b67c..3f5c4ae 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -135,7 +135,6 @@
 TARGET_SOC := exynos9611
 
 ## Properties
-TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
 TARGET_PRODUCT_PROP += $(COMMON_PATH)/product.prop
 TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 
diff --git a/product.prop b/product.prop
index 196696e..c9cf232 100644
--- a/product.prop
+++ b/product.prop
@@ -1,5 +1,2 @@
-# Set the sample rate for the BT device
-persist.bluetooth.samsung_samplerate.supported=true
-
 # Enable unspecialized app process pool
 persist.device_config.runtime_native.usap_pool_enabled=true
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 27fbc05..3fb0320 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -1,6 +1,9 @@
 # Camera
 persist.vendor.sys.camera. u:object_r:vendor_camera_prop:s0
 
+# Charger
+ro.charger.enable_suspend  u:object_r:exported_default_prop:s0
+
 # Factory
 ro.factory.factory_binary  u:object_r:vendor_factory_prop:s0
 
diff --git a/system.prop b/system.prop
deleted file mode 100644
index e774bc7..0000000
--- a/system.prop
+++ /dev/null
@@ -1,18 +0,0 @@
-### SAMSUNG SPECIFIC
-ro.product_ship=true
-# Set csc support in OMX
-# If not set or set to 0, OMX will only use BT.601 colorspace.
-ro.vendor.cscsupported=1
-# Set cmc properties
-ro.cmc.device_type=sd
-ro.cmc.version=2.0
-
-### CHARGER
-ro.charger.enable_suspend=true
-
-### KEYSTORE
-ro.security.keystore.keytype=sak,gak
-
-### WIFI
-wifi.direct.interface=p2p0
-ro.boot.wificountrycode=00
diff --git a/vendor.prop b/vendor.prop
index 60e5233..d13434e 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,29 +1,31 @@
-### AUDIO
+## Audio
 audio.offload.min.duration.secs=30
 aaudio.mmap_policy=2
 aaudio.mmap_exclusive_policy=2
 aaudio.hw_burst_min_usec=2000
 af.fast_track_multiplier=1
 
-### DALVIK
+## Charger
+ro.charger.enable_suspend=true
+
+## Dalvik
 dalvik.vm.lockprof.threshold=500
 
-### KEYSTORE
-ro.hardware.keystore=mdfpp
+## FRP
+ro.frp.pst=/dev/block/persistent
 
-### OPENGLES
-ro.opengles.version=196610
-
-### SAMSUNG_SLSI
-debug.slsi_platform=1
-debug.hwc.winupdate=1
-
-### SURFACEFLINGER
-# Disable backpressure propagation
+## Graphics
 debug.sf.disable_backpressure=1
 debug.sf.latch_unsignaled=1
+ro.opengles.version=196610
 ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 
-### DEVELOPER SETTINGS
-# Disable invocation of oem_lock
-ro.frp.pst=/dev/block/persistent
+## Samsung specific
+ro.product_ship=true
+# Set csc support in OMX
+# If not set or set to 0, OMX will only use BT.601 colorspace.
+ro.vendor.cscsupported=1
+
+## Wi-Fi
+wifi.direct.interface=p2p0
+ro.boot.wificountrycode=00