diff --git a/docs/scan/audit/help.go b/docs/scan/audit/help.go
deleted file mode 100644
index c18e6e4dc..000000000
--- a/docs/scan/audit/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package audit
-
-var Usage = []string{"audit [command options]"}
-
-func GetDescription() string {
-	return "Audit your local project's dependencies by generating a dependency tree and scanning it with Xray."
-}
diff --git a/docs/scan/auditgo/help.go b/docs/scan/auditgo/help.go
deleted file mode 100644
index 3e9d62446..000000000
--- a/docs/scan/auditgo/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package auditgo
-
-var Usage = []string{"audit-go [command options]"}
-
-func GetDescription() string {
-	return "Execute an audit Go command, using the configured Xray details."
-}
diff --git a/docs/scan/auditgradle/help.go b/docs/scan/auditgradle/help.go
deleted file mode 100644
index 8ace28ca1..000000000
--- a/docs/scan/auditgradle/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package auditgradle
-
-var Usage = []string{"audit-gradle [command options]"}
-
-func GetDescription() string {
-	return "Execute an audit Gradle command, using the configured Xray details."
-}
diff --git a/docs/scan/auditmvn/help.go b/docs/scan/auditmvn/help.go
deleted file mode 100644
index e6c5f2962..000000000
--- a/docs/scan/auditmvn/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package auditmvn
-
-var Usage = []string{"audit-mvn [command options]"}
-
-func GetDescription() string {
-	return "Execute an audit Maven command, using the configured Xray details."
-}
diff --git a/docs/scan/auditnpm/help.go b/docs/scan/auditnpm/help.go
deleted file mode 100644
index 4dcf405a8..000000000
--- a/docs/scan/auditnpm/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package auditnpm
-
-var Usage = []string{"audit-npm [command options]"}
-
-func GetDescription() string {
-	return "Execute an audit Npm command, using the configured Xray details."
-}
diff --git a/docs/scan/auditpip/help.go b/docs/scan/auditpip/help.go
deleted file mode 100644
index 94731bdf6..000000000
--- a/docs/scan/auditpip/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package auditpip
-
-var Usage = []string{"audit-pip [command options]"}
-
-func GetDescription() string {
-	return "Execute an audit Pip command, using the configured Xray details."
-}
diff --git a/docs/scan/auditpipenv/help.go b/docs/scan/auditpipenv/help.go
deleted file mode 100644
index 9fae12c35..000000000
--- a/docs/scan/auditpipenv/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package auditpipenv
-
-var Usage = []string{"audit-pipenv [command options]"}
-
-func GetDescription() string {
-	return "Execute an audit Pipenv command, using the configured Xray details."
-}
diff --git a/docs/scan/buildscan/help.go b/docs/scan/buildscan/help.go
deleted file mode 100644
index 1a487a28e..000000000
--- a/docs/scan/buildscan/help.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package buildscan
-
-var Usage = []string{"bs [command options] <build name> <build number>"}
-
-func GetDescription() string {
-	return "Scan a published build-info with Xray."
-}
-
-func GetArguments() string {
-	return `	build name
-		Build name.
-
-	build number
-		Build number.`
-}
diff --git a/docs/scan/curation/help.go b/docs/scan/curation/help.go
deleted file mode 100644
index 6727c7bbb..000000000
--- a/docs/scan/curation/help.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package curation
-
-var Usage = []string{"curation-audit [command options]"}
-
-func GetDescription() string {
-	return "Audit your project dependencies for their curation status."
-}
diff --git a/docs/scan/scan/help.go b/docs/scan/scan/help.go
deleted file mode 100644
index 13e9936a5..000000000
--- a/docs/scan/scan/help.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package scan
-
-var Usage = []string{"scan [command options] <source pattern> ",
-	"scan [command options] --spec=<spec file> "}
-
-func GetDescription() string {
-	return "Scan files located on the local file-system with Xray."
-}
-
-func GetArguments() string {
-	return `	source pattern
-		Specifies the local file system path of the files to be scanned.
-		You can specify multiple files by using wildcards, Ant pattern or a regular expression.
-		If you have specified that you are using regular expressions, then the first one used in the argument must be enclosed in parenthesis.`
-}
diff --git a/utils/cliutils/commandsflags.go b/utils/cliutils/commandsflags.go
index 9946e24cf..d6233273b 100644
--- a/utils/cliutils/commandsflags.go
+++ b/utils/cliutils/commandsflags.go
@@ -103,21 +103,6 @@ const (
 	JpdAdd         = "jpd-add"
 	JpdDelete      = "jpd-delete"
 
-	// Xray's Commands Keys
-	XrCurl        = "xr-curl"
-	CurationAudit = "curation-audit"
-	Audit         = "audit"
-	AuditMvn      = "audit-maven"
-	AuditGradle   = "audit-gradle"
-	AuditNpm      = "audit-npm"
-	AuditGo       = "audit-go"
-	AuditPip      = "audit-pip"
-	AuditPipenv   = "audit-pipenv"
-	DockerScan    = "docker scan"
-	XrScan        = "xr-scan"
-	BuildScan     = "build-scan"
-	OfflineUpdate = "offline-update"
-
 	// Config commands keys
 	AddConfig  = "config-add"
 	EditConfig = "config-edit"