diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index df70527da6c63c8fcb043bf5d3e681aeb0e36424..bff894cd04017167aa211a42b6deafe8eafeeba1 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,7 +1,7 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/rr_k5fpr.mk
+    $(LOCAL_DIR)/full_k5fpr.mk
 
 COMMON_LUNCH_CHOICES := \
-    rr_k5fpr-eng \
-    rr_k5fpr-userdebug \
-    rr_k5fpr-user
+    full_k5fpr-eng \
+    full_k5fpr-userdebug \
+    full_k5fpr-user
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d0dabb95f3cf800ce973641fc9b0e2c1e9dd1270..a748626e04f909922683abff7865bd3e5293eb73 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -46,6 +46,9 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 526848000
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_FLASH_BLOCK_SIZE := 131072
 
+# Dex
+WITH_DEXPREOPT=false
+
 # Partitions types
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
diff --git a/rr_k5fpr.mk b/full_k5fpr.mk
similarity index 92%
rename from rr_k5fpr.mk
rename to full_k5fpr.mk
index ea3a17e22a7d72e099f416f394ce5dc6d73a5e9b..0fa608983b93ef20d188714ac041fdb5744e22bb 100644
--- a/rr_k5fpr.mk
+++ b/full_k5fpr.mk
@@ -20,13 +20,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from A7010 device
 $(call inherit-product, device/lenovo/k5fpr/device_k5fpr.mk)
 
-# Inherit some common RR stuff.
-$(call inherit-product, vendor/rr/config/common.mk)
-
 PRODUCT_GMS_CLIENTID_BASE := android-lenovo
 
 PRODUCT_DEVICE := k5fpr
-PRODUCT_NAME := rr_k5fpr
+PRODUCT_NAME := full_k5fpr
 PRODUCT_BRAND := Lenovo
 PRODUCT_MANUFACTURER := Lenovo
 PRODUCT_MODEL := Lenovo A7010a48
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 46c51b4d2b7ddf39dc552b8a1c7aeee47d2764ad..0000000000000000000000000000000000000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright 2015 The Android Open Source 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 is executed by build/envsetup.sh, and can use anything
-# defined in envsetup.sh.
-#
-# In particular, you can add lunch options with the add_lunch_combo
-# function: add_lunch_combo generic-eng
-
-for var in eng user userdebug; do
-  add_lunch_combo rr_k5fpr-$var
-done