diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d156ba1..dd8813e 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,3 +15,8 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/lineage_j8y18lte.mk
+
+COMMON_LUNCH_CHOICES := \
+    lineage_j8y18lte-eng \
+    lineage_j8y18lte-user \
+    lineage_j8y18lte-userdebug
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 01aa31b..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2017-2020 The LineageOS 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.
-
-
-# Use this to add to lineage's lunch command menu
-for var in eng user userdebug; do
-  add_lunch_combo lineage_j8y18lte-$var
-done