diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 72527664..41990c62 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -258,8 +258,6 @@ BOARD_SEPOLICY_DIRS += \
     $(COMMON_PATH)/sepolicy
 
 # Treble
-BOARD_VNDK_RUNTIME_DISABLE := true
-BOARD_VNDK_VERSION := current
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 PRODUCT_VENDOR_MOVE_ENABLED := true
 
diff --git a/wayne.mk b/wayne.mk
index 115bb610..799228ff 100644
--- a/wayne.mk
+++ b/wayne.mk
@@ -425,10 +425,6 @@ PRODUCT_PACKAGES += \
     android.hardware.vibrator@1.0-impl \
     android.hardware.vibrator@1.0-service
 
-# VNDK
-PRODUCT_PACKAGES += \
-    vndk_package
-
 # Wifi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.0-service \