diff --git a/BoardConfig.mk b/BoardConfig.mk
index 60dfa75..aa50404 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -28,10 +28,6 @@ DEVICE_PATH := device/xiaomi/clover
 # Platform
 BOARD_VENDOR_PLATFORM := xiaomi-sdm660
 
-# Props
-TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
-TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
-
 # DT2W
 TARGET_TAP_TO_WAKE_NODE := "/sys/devices/soc/c177000.i2c/i2c-3/3-0038/fts_gesture_mode"
 
diff --git a/device.mk b/device.mk
index 80ca578..08375fb 100644
--- a/device.mk
+++ b/device.mk
@@ -25,17 +25,14 @@
 # Inherit the fusion-common definitions
 $(call inherit-product, device/xiaomi/sdm660-common/platform.mk)
 
-# setup dalvik vm configs
-#$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
-
-# setup HWUI configs
-#$(call inherit-product, frameworks/native/build/phone-xxhdpi-3072-hwui-memory.mk)
-
 DEVICE_PATH := device/xiaomi/clover
 
 #  Overlays
 DEVICE_PACKAGE_OVERLAYS += \
     $(DEVICE_PATH)/overlay
+    
+# Device properties
+include $(DEVICE_PATH)/device_prop.mk
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
diff --git a/device_prop.mk b/device_prop.mk
new file mode 100644
index 0000000..e099a60
--- /dev/null
+++ b/device_prop.mk
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2018 The Xiaomi-SDM660 Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# This file sets variables that control the way modules are built
+# thorughout the system. It should not be used to conditionally
+# disable makefiles (the proper mechanism to control what gets
+# included in a build is to use PRODUCT_PACKAGES in a product
+# definition file).
+#
+
+# Audio
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.vendor.audio.sdk.fluencetype=fluence \
+	persist.vendor.audio.fluence.voicecall=true \
+	persist.vendor.audio.fluence.voicerec=true \
+	persist.vendor.audio.fluence.speaker=true \
+	persist.vendor.audio.fluence.audiorec=true \
+	vendor.audio.adm.buffering.ms=3 \
+	vendor.audio.offload.track.enable=true
+
+# Camera
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.radio.VT_CAM_INTERFACE=1 \
+	persist.camera.stats.test=5
+
+# Display
+PRODUCT_PROPERTY_OVERRIDES += \
+	debug.sf.recomputecrop=0 \
+	debug.vds.allow_hwc=0
+
+# Media
+PRODUCT_PROPERTY_OVERRIDES += \
+	mm.enable.qcom_parser=13631487
+
+# System property for color temperature
+PRODUCT_PROPERTY_OVERRIDES += \
+	ro.colorpick_adjust=true \
+	ro.df.effect.conflict=1
+
+# Single SIM
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.radio.multisim.config=ssss
+
+# Ultra Sound
+PRODUCT_PROPERTY_OVERRIDES += \
+	audio.chk.cal.us=0
+
diff --git a/system.prop b/system.prop
deleted file mode 100644
index 1f1cb5d..0000000
--- a/system.prop
+++ /dev/null
@@ -1,228 +0,0 @@
-rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
-persist.rild.nitz_plmn=
-persist.rild.nitz_long_ons_0=
-persist.rild.nitz_long_ons_1=
-persist.rild.nitz_long_ons_2=
-persist.rild.nitz_long_ons_3=
-persist.rild.nitz_short_ons_0=
-persist.rild.nitz_short_ons_1=
-persist.rild.nitz_short_ons_2=
-persist.rild.nitz_short_ons_3=
-ril.subscription.types=NV,RUIM
-DEVICE_PROVISIONED=1
-
-#
-# Set network mode to (T/L/G/W/1X/EVDO, T/G/W/L) for 7+5 mode device on DSDS mode
-#
-#change by shixiaoyou, 2018/04/02
-ro.telephony.default_network=22
-
-#change by lizhihai, 2018/07/05
-debug.sf.enable_hwc_vds=1
-debug.vds.allow_hwc=0
-debug.sf.hw=1
-debug.sf.latch_unsignaled=1
-debug.gralloc.enable_fb_ubwc=1
-dalvik.vm.heapsize=36m
-dev.pm.dyn_samplingrate=1
-persist.demo.hdmirotationlock=false
-debug.sf.recomputecrop=0
-
-#ro.hdmi.enable=true
-#
-# system props for the cne module
-#
-persist.vendor.cne.feature=1
-
-#system props for the MM modules
-media.stagefright.enable-player=true
-media.stagefright.enable-http=true
-media.stagefright.enable-aac=true
-media.stagefright.enable-qcp=true
-media.stagefright.enable-scan=true
-mmp.enable.3g2=true
-media.aac_51_output_enabled=true
-mm.enable.smoothstreaming=true
-#codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF AVI DTS FLV 3GP 3G2 MKV MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF APE DSD
-mm.enable.qcom_parser=13631487
-persist.mm.enable.prefetch=true
-
-#property to enable narrow search range for video encoding
-vidc.enc.target_support_bframe=1
-vendor.vidc.enc.disable_bframes=1
-vendor.vidc.dec.enable.downscalar=1
-
-# enable PQ feature by default
-vendor.vidc.enc.disable.pq=false
-
-# Additional buffers shared between Camera and Video
-vidc.enc.dcvs.extra-buff-count=2
-
-#Netflix custom property
-ro.netflix.bsp_rev=Q660-13149-1
-
-#
-# system props for the data modules
-#
-ro.use_data_netmgrd=true
-persist.data.netmgrd.qos.enable=true
-persist.data.mode=concurrent
-#system props for time-services
-persist.timed.enable=true
-persist.delta_time.enable=true
-
-# system property for maximum number of HFP client connections
-bt.max.hfpclient.connections=1
-#force disable Bluetooth AAC by default
-persist.bt.a2dp.aac_disable=true
-
-# System property for cabl
-ro.qualcomm.cabl=0
-
-# System property for color temperature
-ro.colorpick_adjust=true
-ro.df.effect.conflict=1
-
-#
-# System props for telephony
-# System prop to turn on CdmaLTEPhone always
-telephony.lteOnCdmaDevice=1
-
-#Simulate sdcard on /data/media
-#
-persist.fuse_sdcard=true
-
-#system prop for wipower support
-ro.bluetooth.emb_wp_mode=true
-ro.bluetooth.wipower=true
-
-#
-#snapdragon value add features
-#
-
-#system prop for RmNet Data
-persist.rmnet.data.enable=true
-persist.data.wda.enable=true
-persist.data.df.dl_mode=5
-persist.data.df.ul_mode=5
-persist.data.df.agg.dl_pkt=10
-persist.data.df.agg.dl_size=4096
-persist.data.df.mux_count=8
-persist.data.df.iwlan_mux=9
-persist.data.df.dev_name=rmnet_usb0
-
-#
-# system property determining camera HAL to be used for a Video call
-#
-# 1 is camera1
-# 2 or anything else is camera2
-persist.radio.VT_CAM_INTERFACE=1
-
-#add by Sven to close camera hal3
-persist.vendor.qti.telephony.vt_cam_interface=1
-
-#property to enable user to access Google WFD settings
-persist.debug.wfd.enable=1
-#Enable stm-events
-persist.debug.coresight.config=stm-events
-##property to choose between virtual/external wfd display
-persist.sys.wfd.virtual=0
-
-# system prop for NFC DT
-ro.nfc.port=I2C
-
-#property for vendor specific library
-ro.vendor.at_library=libqti-at.so
-
-#min/max cpu in core control
-ro.vendor.qti.core_ctl_min_cpu=2
-ro.vendor.qti.core_ctl_max_cpu=4
-
-#Bringup properties
-persist.radio.atfwd.start=true
-
-#property to enable VDS WFD solution
-persist.hwc.enable_vds=1
-
-#Increase cached app limit
-ro.vendor.qti.sys.fw.bg_apps_limit=60
-
-#Settings to enable sensors
-#Device Orientation sensor
-#penghoubing@huaqin.com modified at 2018.5.30
-#ro.vendor.sensors.dev_ori=true
-#Persistent Motion Detector
-ro.vendor.sensors.pmd=true
-#Stationary Detector
-ro.vendor.sensors.sta_detect=true
-#Motion Detector
-ro.vendor.sensors.mot_detect=true
-
-#Expose aux camera for below packages
-camera.aux.packagelist=org.codeaurora.snapcam
-
-#disable UBWC for camera
-persist.camera.preview.ubwc=0
-
-# Create zram disk
-ro.vendor.qti.config.zram=true
-
-#set maximum supported adapter voltage
-persist.chg.max_volt_mv=9000
-
-#Property to enable display default color mode
-vendor.display.enable_default_color_mode=0
-
-# Property for backup NTP Server
-persist.backup.ntpServer="0.pool.ntp.org"
-# enable IZat OptInApp overlay
-persist.vendor.overlay.izat.optin=rro
-
-#Disable Skip Validate
-sdm.debug.disable_skip_validate=1
-
-#Ultra sound support
-audio.chk.cal.us=0
-
-#Use specified acdb files, by elf.wang
-persist.audio.calfile0=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Bluetooth_cal.acdb
-persist.audio.calfile1=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_General_cal.acdb
-persist.audio.calfile2=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Global_cal.acdb
-persist.audio.calfile3=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Handset_cal.acdb
-persist.audio.calfile4=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Hdmi_cal.acdb
-persist.audio.calfile5=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Headset_cal.acdb
-persist.audio.calfile6=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_Speaker_cal.acdb
-persist.audio.calfile7=/vendor/etc/acdbdata/QRD/sdm660-snd-card-skush/QRD_SKUSH_workspaceFile.qwsp
-persist.audio.calfile8=/vendor/etc/acdbdata/adsp_avs_config.acdb
-
-#Add acdb files for D9P, by elf.wang
-persist.audio.calfile0D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Bluetooth_cal.acdb
-persist.audio.calfile1D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_General_cal.acdb
-persist.audio.calfile2D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Global_cal.acdb
-persist.audio.calfile3D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Handset_cal.acdb
-persist.audio.calfile4D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Hdmi_cal.acdb
-persist.audio.calfile5D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Headset_cal.acdb
-persist.audio.calfile6D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_Speaker_cal.acdb
-persist.audio.calfile7D9P=/vendor/etc/acdbdata/QRD/sdm660-snd-card-d9p/QRD_D9P_workspaceFile.qwsp
-persist.audio.calfile8D9P=/vendor/etc/acdbdata/adsp_avs_config.acdb
-
-#Add for Dirac by elf
-persist.dirac.acs.controller=qem
-persist.dirac.acs.ignore_error=1
-persist.dirac.acs.storeSettings=1
-ro.audio.soundfx.dirac=true
-
-#Disable NRSM function
-persist.vendor.dpm.feature=1
-
-#LCD
-ro.sf.lcd_density=265
-
-#enable fastdormancy
-persist.env.fastdorm.enabled=true
-# enable new autobrightness algo
-sys.autobrightness_optimize=true
-
-#add by shixiaoyou, 2018/04/02, set single SIM
-#Set the SIM model for DSDS. ssss - Single model, dsds - Dual model.
-persist.radio.multisim.config=ssss
diff --git a/vendor.prop b/vendor.prop
deleted file mode 100644
index 32d35be..0000000
--- a/vendor.prop
+++ /dev/null
@@ -1,67 +0,0 @@
-persist.sys.job_delay=true
-persist.sys.mcd_config_file=/system/etc/mcd_default.conf
-video.disable.ubwc=1
-dalvik.vm.heapgrowthlimit=256m
-dalvik.vm.heapstartsize=8m
-dalvik.vm.heapsize=512m
-dalvik.vm.heaptargetutilization=0.75
-dalvik.vm.heapminfree=512k
-dalvik.vm.heapmaxfree=8m
-persist.radio.multisim.config=ssss
-persist.vendor.qcomsysd.enabled=1
-ro.com.android.dataroaming=true
-ro.vendor.extension_library=libqti-perfd-client.so
-persist.vendor.radio.apm_sim_not_pwdn=1
-persist.vendor.radio.sib16_support=1
-persist.vendor.radio.custom_ecc=1
-persist.vendor.radio.rat_on=combine
-persist.radio.schd.cache=3500
-sys.vendor.shutdown.waittime=500
-ro.build.shutdown_timeout=0
-ro.frp.pst=/dev/block/bootdevice/by-name/frp
-ro.opengles.version=196610
-vendor.qcom.bluetooth.soc=cherokee
-af.fast_track_multiplier=1
-vendor.audio_hal.period_size=192
-ro.vendor.audio.sdk.fluencetype=fluence
-persist.vendor.audio.fluence.voicecall=true
-persist.vendor.audio.fluence.voicerec=true
-persist.vendor.audio.fluence.speaker=true
-persist.vendor.audio.fluence.audiorec=true
-vendor.audio.tunnel.encode=false
-persist.vendor.audio.ras.enabled=false
-vendor.audio.offload.buffer.size.kb=64
-audio.offload.min.duration.secs=30
-audio.offload.video=true
-vendor.audio.offload.track.enable=true
-audio.deep_buffer.media=true
-vendor.voice.path.for.pcm.voip=true
-vendor.audio.offload.multiaac.enable=true
-vendor.audio.dolby.ds2.enabled=false
-vendor.audio.dolby.ds2.hardbypass=false
-vendor.audio.offload.multiple.enabled=false
-vendor.audio.offload.passthrough=false
-ro.vendor.audio.sdk.ssr=false
-vendor.audio.offload.gapless.enabled=true
-vendor.audio.safx.pbe.enabled=true
-vendor.audio.parser.ip.buffer.size=262144
-vendor.audio.flac.sw.decoder.24bit=true
-persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxhd-aac
-vendor.audio.use.sw.alac.decoder=true
-vendor.audio.use.sw.ape.decoder=true
-vendor.audio.hw.aac.encoder=true
-vendor.fm.a2dp.conc.disabled=true
-vendor.audio.noisy.broadcast.delay=600
-persist.vendor.audio.hifi.int_codec=true
-vendor.audio.offload.pstimeout.secs=3
-vendor.audio.adm.buffering.ms=3
-ro.hardware.fingerprint=fpc
-ro.boot.fingerprint=fpc
-ro.vendor.sensors.facing=false
-ro.vendor.sensors.cmc=false
-ro.vendor.sdk.sensors.gestures=false
-rild.libpath=/system/vendor/lib64/libril-qc-qmi-1.so
-sys.fp.miui.token=0
-persist.camera.stats.test=5
-persist.radio.data_con_rprt=1
-persist.sys.ssr.restart_level=ALL_ENABLE