diff --git a/local/platformsh/commands.go b/local/platformsh/commands.go
index 29c154c9..8fb943c7 100644
--- a/local/platformsh/commands.go
+++ b/local/platformsh/commands.go
@@ -44,9 +44,7 @@ var Commands = []*console.Command{
 		Name:     "clear-cache",
 		Aliases:  []*console.Alias{
 			{Name: "cloud:clearcache"},
-			{Name: "clearcache", Hidden: true},
 			{Name: "cloud:cc"},
-			{Name: "cc", Hidden: true},
 		},
 		Usage:    "Clear the CLI cache",
 	},
@@ -957,31 +955,17 @@ var Commands = []*console.Command{
 		Category: "cloud:self",
 		Name:     "install",
 		Aliases:  []*console.Alias{
-			{Name: "self:install", Hidden: true},
 			{Name: "cloud:local:install"},
-			{Name: "local:install", Hidden: true},
 		},
 		Usage:    "Install or update CLI configuration files",
 		Hidden:   console.Hide,
 	},
-	{
-		Category: "cloud:self",
-		Name:     "stats",
-		Aliases:  []*console.Alias{
-			{Name: "self:stats", Hidden: true},
-		},
-		Usage:    "View stats on GitHub package downloads",
-		Hidden:   console.Hide,
-	},
 	{
 		Category: "cloud:self",
 		Name:     "update",
 		Aliases:  []*console.Alias{
-			{Name: "self:update", Hidden: true},
 			{Name: "cloud:self-update"},
-			{Name: "self-update", Hidden: true},
 			{Name: "cloud:update"},
-			{Name: "update", Hidden: true},
 		},
 		Usage:    "Update the CLI to the latest version",
 		Hidden:   console.Hide,
diff --git a/local/platformsh/generator/commands.go b/local/platformsh/generator/commands.go
index 676ecaae..9399f88f 100644
--- a/local/platformsh/generator/commands.go
+++ b/local/platformsh/generator/commands.go
@@ -138,6 +138,9 @@ func parseCommands(home string) (string, error) {
 		if command.Name == "list" || command.Name == "help" {
 			continue
 		}
+		if command.Name == "self:stats" {
+			continue
+		}
 		if strings.HasPrefix(command.Name, "self:") {
 			command.Hidden = true
 		}
@@ -155,13 +158,15 @@ func parseCommands(home string) (string, error) {
 		}
 		name := strings.TrimPrefix("cloud:"+command.Name, namespace+":")
 		aliases := []string{}
-		if namespace != "cloud" {
+		if namespace != "cloud" && !strings.HasPrefix(command.Name, "self:") {
 			aliases = append(aliases, fmt.Sprintf("{Name: \"%s\", Hidden: true}", command.Name))
 		}
 		for _, usage := range command.Usage {
 			if allCommandNames[usage] {
 				aliases = append(aliases, fmt.Sprintf("{Name: \"cloud:%s\"}", usage))
-				aliases = append(aliases, fmt.Sprintf("{Name: \"%s\", Hidden: true}", usage))
+				if namespace != "cloud" && !strings.HasPrefix(command.Name, "self:") {
+					aliases = append(aliases, fmt.Sprintf("{Name: \"%s\", Hidden: true}", usage))
+				}
 			}
 		}
 		if command.Name == "environment:push" {