diff --git a/.golangci.yaml b/.golangci.yaml
deleted file mode 100644
index c8f29e52..00000000
--- a/.golangci.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-run:
-  timeout: 20m
-  issue-exit-code: 0 # we will change this later
-  tests: true
-  skip-dirs-use-default: true
-  modules-download-mode: readonly
-
-issues:
-  max-issues-per-linter: 0
-  max-same-issues: 0
-  new: false
-  exclude-rules:
-    - path: /
-      text: parameter '(ctx|req)' seems to be unused
-      linters:
-        - revive
-    - path: service/step_handlers_test.go
-      text: parameter 'r' seems to be unused
-      linters:
-        - revive
-output:
-  print-linter-name: true
-  sort-results: true
-  uniq-by-line: false
-  print-issued-lines: true
-
-linters:
-  disable-all: true
-  fast: false
-  enable:
-    # A stricter replacement for gofmt.
-    - gofumpt
-    # Inspects source code for security problems.
-    - gosec
-    # Check for correctness of programs.
-    - govet
-    # Drop-in replacement of golint.
-    - revive
diff --git a/samples/storageclass/powerflex-replication.yaml b/samples/storageclass/powerflex-replication.yaml
index e3927dbc..cfbc3951 100644
--- a/samples/storageclass/powerflex-replication.yaml
+++ b/samples/storageclass/powerflex-replication.yaml
@@ -121,6 +121,6 @@ volumeBindingMode: WaitForFirstConsumer
 # allowedTopologies helps scheduling pods on worker nodes which match all of below expressions.
 allowedTopologies:
   - matchLabelExpressions:
-      - key: csi-vxflexos.dellemc.com/<SYSTEM_ID> # Insert System ID
+      - key: csi-vxflexos.dellemc.com/<SYSTEM_ID>
         values:
           - csi-vxflexos.dellemc.com
diff --git a/test/helm/2vols-multi-array/templates/pvc1.yaml b/test/helm/2vols-multi-array/templates/pvc1.yaml
index 64b75de8..7e055a70 100644
--- a/test/helm/2vols-multi-array/templates/pvc1.yaml
+++ b/test/helm/2vols-multi-array/templates/pvc1.yaml
@@ -8,12 +8,12 @@ provisioner: csi-vxflexos.dellemc.com
 reclaimPolicy: Delete
 allowVolumeExpansion: true
 parameters:
-  storagepool: <STORAGE_POOL> #Insert Storage pool.
-  systemID: <SYSTEM_ID> #Insert System ID
+  storagepool: <STORAGE_POOL>
+  systemID: <SYSTEM_ID>
 volumeBindingMode: WaitForFirstConsumer
 allowedTopologies:
   - matchLabelExpressions:
-      - key: csi-vxflexos.dellemc.com/<SYSTEM_ID> #Insert System ID
+      - key: csi-vxflexos.dellemc.com/<SYSTEM_ID>
         values:
           - csi-vxflexos.dellemc.com
 ---