diff --git a/groups/widevine/L1_Gen/BoardConfig.mk b/groups/widevine/L1_Gen/BoardConfig.mk
deleted file mode 100644
index 2ec3dd232..000000000
--- a/groups/widevine/L1_Gen/BoardConfig.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BOARD_USE_INTEL_OEMCRYPTO := true
-BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/widevine/gen/gen_common
-
diff --git a/groups/widevine/L1_Gen/option.spec b/groups/widevine/L1_Gen/option.spec
deleted file mode 100644
index 5d65a2315..000000000
--- a/groups/widevine/L1_Gen/option.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-[defaults]
-additional_lib =
-widevine_arch =
diff --git a/groups/widevine/L1_Gen/product.mk b/groups/widevine/L1_Gen/product.mk
deleted file mode 100644
index 3212f7780..000000000
--- a/groups/widevine/L1_Gen/product.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#enable Widevine drm
-PRODUCT_PROPERTY_OVERRIDES += drm.service.enabled=true
-
-
-# There is an additional dependency on hdcpd that should be controlled
-# through the content-protection mixin
-
-$(call inherit-product, vendor/widevine/libwvdrmengine/apex/device/device.mk)
-
-#PRODUCT_PACKAGES += com.google.android.widevine
-    #android.hardware.drm-service.widevine
-    #com.google.widevine.software.drm.xml \
-    com.google.widevine.software.drm \
-    libdrmwvmplugin \
-    libdrmclearkeyplugin \
-    libwvm \
-    libdrmdecrypt \
-    libWVStreamControlAPI_L1 \
-    libwvdrm_L1
-
-#PRODUCT_PACKAGES += android.hardware.drm@1.4-service.widevine \
-                    android.hardware.drm@1.0-service \
-                    android.hardware.drm@1.0-impl \
-		    android.hardware.drm@1.4-service.clearkey \
-		    libdrmclearkeyplugin \
-                    libwvhidl 
-
-# WV Modular
-#PRODUCT_PACKAGES += libwvdrmengine
-
-PRODUCT_PACKAGES_ENG += ExoPlayerDemo
-
-PRODUCT_PACKAGES += liboemcrypto.L1
-#		    sigma \
-
-#CP prebuilt binaries
-#PRODUCT_PACKAGES +=   \
-    libcoreuclient    \
-    libcoreuinterface \
-    libcoreuservice   \
-    coreu             \
-    cplib             \
-    libpavp           \
-    libpcp            \
-    libskuwa          \
-    msync             \
-
-BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 1
-TARGET_CFLAGS += -D__ANDROID_APEX__
-TARGET_CPPFLAGS += -D__ANDROID_APEX__
diff --git a/groups/widevine/L3_Gen/BoardConfig.mk b/groups/widevine/L3_Gen/BoardConfig.mk
deleted file mode 100644
index 931f044a4..000000000
--- a/groups/widevine/L3_Gen/BoardConfig.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/widevine/gen/gen_common
diff --git a/groups/widevine/L3_Gen/product.mk b/groups/widevine/L3_Gen/product.mk
deleted file mode 100644
index ac23b33b6..000000000
--- a/groups/widevine/L3_Gen/product.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-PRODUCT_PROPERTY_OVERRIDES += drm.service.enabled=true
-PRODUCT_PACKAGES += \
-  android.hardware.drm-service.widevine
-  #libdrmclearkeyplugin 
-  #libwvdrmengine \
-  #libwvhidl \
-  #android.hardware.drm@1.4-service.widevine
-
-PRODUCT_PACKAGES_ENG += ExoPlayerDemo
-BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 3
-
diff --git a/groups/widevine/default/BoardConfig.mk b/groups/widevine/default/BoardConfig.mk
deleted file mode 100644
index 931f044a4..000000000
--- a/groups/widevine/default/BoardConfig.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/widevine/gen/gen_common
diff --git a/groups/widevine/default/product.mk b/groups/widevine/default/product.mk
deleted file mode 100644
index 1974bf2b6..000000000
--- a/groups/widevine/default/product.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-PRODUCT_PROPERTY_OVERRIDES += drm.service.enabled=true
-PRODUCT_PACKAGES += \
-  android.hardware.drm@1.4-service.widevine \
-  libdrmclearkeyplugin 
-  #libwvdrmengine \
-  #libwvhidl \
-  #android.hardware.drm@1.4-service.widevine
-
-PRODUCT_PACKAGES_ENG += ExoPlayerDemo
-BOARD_WIDEVINE_OEMCRYPTO_LEVEL := 3
-