diff --git a/Makefile b/Makefile
index ccf85ad69..b298186a3 100644
--- a/Makefile
+++ b/Makefile
@@ -106,8 +106,6 @@ generate:
 	$(CONTROLLER_GEN) webhook \
 		paths="./pkg/webhooks/sgx/..." \
 		output:webhook:artifacts:config=deployments/sgx_admissionwebhook/webhook
-	$(CONTROLLER_GEN) rbac:roleName=gpu-manager-role paths="./cmd/gpu_plugin/..." output:dir=deployments/operator/rbac
-	cp deployments/operator/rbac/role.yaml deployments/operator/rbac/gpu_manager_role.yaml
 	$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./pkg/..." output:dir=deployments/operator/rbac
 	$(CONTROLLER_GEN) rbac:roleName=manager-role paths="./pkg/fpgacontroller/..." output:dir=deployments/fpga_admissionwebhook/rbac
 
diff --git a/deployments/sgx_plugin/overlays/epc-hook-initcontainer/add-epc-nfd-initcontainer.yaml b/deployments/sgx_plugin/overlays/epc-hook-initcontainer/add-epc-nfd-initcontainer.yaml
deleted file mode 100644
index 168fa94d4..000000000
--- a/deployments/sgx_plugin/overlays/epc-hook-initcontainer/add-epc-nfd-initcontainer.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: intel-sgx-plugin
-spec:
-  template:
-    spec:
-      initContainers:
-      - name: intel-sgx-initcontainer
-        image: intel/intel-sgx-initcontainer:devel
-        imagePullPolicy: IfNotPresent
-        securityContext:
-          readOnlyRootFilesystem: true
-          allowPrivilegeEscalation: false
-        volumeMounts:
-        - mountPath: /etc/kubernetes/node-feature-discovery/source.d/
-          name: nfd-features
-      volumes:
-      - name: nfd-features
-        hostPath:
-          path: /etc/kubernetes/node-feature-discovery/source.d/
-          type: DirectoryOrCreate
diff --git a/deployments/sgx_plugin/overlays/epc-hook-initcontainer/kustomization.yaml b/deployments/sgx_plugin/overlays/epc-hook-initcontainer/kustomization.yaml
deleted file mode 100644
index e000fd063..000000000
--- a/deployments/sgx_plugin/overlays/epc-hook-initcontainer/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resources:
-  - ../../base
-patches:
-  - path: add-epc-nfd-initcontainer.yaml