diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index fb8b0b12..e9a14ec4 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -7,7 +7,6 @@ RECIPE_MAINTAINER:pn-core-image-tiny = "Naveen Saini <naveen.kumar.saini@intel.c
 RECIPE_MAINTAINER:pn-core-image-minimal-initramfs = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER:pn-embree = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-gmmlib = "Lim Siew Hoon <siew.hoon.lim@intel.com>"
-RECIPE_MAINTAINER:pn-hdcp = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-intel-cmt-cat = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-intel-compute-runtime = "Naveen Saini <naveen.kumar.saini@intel.com>"
 RECIPE_MAINTAINER:pn-intel-crypto-mb = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch b/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch
deleted file mode 100644
index 6d32da43..00000000
--- a/recipes-graphics/hdcp/hdcp/0001-main-fix-hdcpd-service-failure.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5cbcecff0bb7fa1c617d3082e7ad94c22e5f4eb1 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 3 Jul 2019 17:13:15 +0800
-Subject: [PATCH] main: fix hdcpd service failure
-
-Child process not able to finish before parent process
-exits, which causing hdcpd service failure.
-
-Added wait function to block parent process
-until child process exits.
-
-Upstream-Status: Submitted [https://github.com/intel/hdcp/pull/17]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- daemon/main.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/daemon/main.cpp b/daemon/main.cpp
-index 9a028d7..ef1e047 100644
---- a/daemon/main.cpp
-+++ b/daemon/main.cpp
-@@ -36,6 +36,7 @@
- #include <sys/ioctl.h>
- #include <fcntl.h>
- #include <iostream>
-+#include <sys/wait.h>
- 
- #include "hdcpdef.h"
- #include "srm.h"
-@@ -93,6 +94,8 @@ int32_t daemon_init(void)
-     }
-     else if (pid != 0)
-     {
-+        int status;
-+        wait(&status);
-         exit(SUCCESS);    // parent exit
-     }
- 
--- 
-2.17.1
-
diff --git a/recipes-graphics/hdcp/hdcp_21.2.0.bb b/recipes-graphics/hdcp/hdcp_21.2.0.bb
deleted file mode 100644
index f45dea02..00000000
--- a/recipes-graphics/hdcp/hdcp_21.2.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY  = "Intel(R) unified HDCP SDK"
-DESCRIPTION = "This is a user space implementation to prevent copying of \
-digital audio & video content across digital display interfaces. It provides \
-Linux user space implementation to enable the HDCP1.4 and HDCP2.2 protection \
-for external digital display interface"
-LICENSE  = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c50969be4feb8b99c6baa3795ede4dce"
-SECTION = "lib"
-
-inherit pkgconfig cmake useradd systemd features_check
-
-SRC_URI = "git://github.com/intel/hdcp.git;branch=master;protocol=https \
-        file://0001-main-fix-hdcpd-service-failure.patch \
-"
-SRCREV = "cacc352159c5bdaf1c21846cecdd1eb7b031e1d3"
-
-REQUIRED_DISTRO_FEATURES = "systemd"
-
-DEPENDS = "libdrm virtual/mesa systemd"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false --gid nogroup media"
-
-SYSTEMD_SERVICE:${PN} = "hdcpd.service"
-SYSTEMD_AUTO_ENABLE = "disable"