diff --git a/Makefile b/Makefile
index d49405b28..4481641ce 100644
--- a/Makefile
+++ b/Makefile
@@ -527,4 +527,4 @@ quick-deploy-hubble:
 
 .PHONY: simplify-dashboards
 simplify-dashboards:
-	cd deploy/legacy/grafana/dashboards/ && go test . -tags=dashboard,simplifydashboard -v
+	go test -tags=dashboard,simplifydashboard -v ./deploy/...
diff --git a/cmd/hubble/daemon_main_linux.go b/cmd/hubble/daemon_main_linux.go
index 00fcf7d91..371f66e85 100644
--- a/cmd/hubble/daemon_main_linux.go
+++ b/cmd/hubble/daemon_main_linux.go
@@ -269,7 +269,7 @@ func setupZapLogger(retinaConfig *config.Config, k8sCfg *rest.Config) *log.ZapLo
 		logger.Fatalf("Failed to setup zap logger: %v", err)
 	}
 
-	namedLogger := log.Logger().Named("retina-enterprise")
+	namedLogger := log.Logger().Named("retina-with-hubble")
 	namedLogger.Info("Traces telemetry initialized with zapai", zap.String("version", retinaVersion), zap.String("appInsightsID", applicationInsightsID))
 
 	return namedLogger
diff --git a/cmd/hubble/subcmd_linux.go b/cmd/hubble/subcmd_linux.go
deleted file mode 100644
index 0ba709b6f..000000000
--- a/cmd/hubble/subcmd_linux.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-package hubble
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/cilium/cilium/pkg/hive"
-	"github.com/cilium/cilium/pkg/option"
-	"github.com/spf13/cobra"
-	"go.etcd.io/etcd/version"
-)
-
-func Cmd(agentHive *hive.Hive) *cobra.Command {
-	hubbleCmd := &cobra.Command{
-		Use:   "hubble-control-plane",
-		Short: "Start Hubble control plane",
-		Run: func(cobraCmd *cobra.Command, _ []string) {
-			if v, _ := cobraCmd.Flags().GetBool("version"); v {
-				fmt.Printf("%s %s\n", cobraCmd.Name(), version.Version)
-				os.Exit(0)
-			}
-
-			// Populate the config and initialize the logger early as these
-			// are shared by all commands.
-			initDaemonConfig(agentHive.Viper())
-			initLogging()
-
-			if err := agentHive.Run(); err != nil {
-				logger.Fatal(err)
-			}
-		},
-	}
-
-	agentHive.RegisterFlags(hubbleCmd.Flags())
-	hubbleCmd.AddCommand(
-		// cmdrefCmd,
-		agentHive.Command(),
-	)
-
-	InitGlobalFlags(hubbleCmd, agentHive.Viper())
-	option.InitConfig(hubbleCmd, "retina-agent", "retina", agentHive.Viper())
-
-	return hubbleCmd
-}
diff --git a/deploy/hubble/manifests/controller/helm/retina/values.yaml b/deploy/hubble/manifests/controller/helm/retina/values.yaml
index 3a52e4159..75b91a54e 100644
--- a/deploy/hubble/manifests/controller/helm/retina/values.yaml
+++ b/deploy/hubble/manifests/controller/helm/retina/values.yaml
@@ -16,7 +16,7 @@ os:
 # FIXME: remove unnecessary pieces, etc.
 operator:
   enabled: true
-  repository: acndev.azurecr.io/retina-operator-enterprise
+  repository: acndev.azurecr.io/retina-operator
   pullPolicy: Always
   tag: "latest"
   leaderElection: true
@@ -27,12 +27,12 @@ agent:
   leaderElection: false
   enabled: true
   name: retina-agent
-  repository: acndev.azurecr.io/retina-agent-enterprise
+  repository: acndev.azurecr.io/retina-agent
   tag: "latest"
   init:
     enabled: true
     name: retina-agent-init
-    repository: acndev.azurecr.io/retina-agent-init-enterprise
+    repository: acndev.azurecr.io/retina-agent-init
     tag: "latest"
   pullPolicy: Always
   container:
diff --git a/deploy/legacy/graphana/dashboards/README.md b/deploy/legacy/graphana/dashboards/README.md
deleted file mode 100644
index 1dfbae4b4..000000000
--- a/deploy/legacy/graphana/dashboards/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# README
-
-Dashboards here are a copy of dashboards published in Retina organization on grafana.com
diff --git a/pkg/hubble/hubble_linux.go b/pkg/hubble/hubble_linux.go
index 3be82e5f5..b6a62f26c 100644
--- a/pkg/hubble/hubble_linux.go
+++ b/pkg/hubble/hubble_linux.go
@@ -62,7 +62,6 @@ func newRetinaHubble(params hubbleParams) *RetinaHubble {
 }
 
 func (rh *RetinaHubble) defaultOptions() {
-	// Set the default values for Retina-enterprise.
 	// Not final, will be updated later.
 	option.Config.HubblePreferIpv6 = false
 	option.Config.EnableHighScaleIPcache = false
diff --git a/pkg/shared/config/type.go b/pkg/shared/config/type.go
index d912156be..fe7e61446 100644
--- a/pkg/shared/config/type.go
+++ b/pkg/shared/config/type.go
@@ -1 +1,2 @@
+// Placeholder file. Required for windows build and lint.
 package config
diff --git a/pkg/shared/telemetry/type.go b/pkg/shared/telemetry/type.go
index 073f40d23..4517a9e84 100644
--- a/pkg/shared/telemetry/type.go
+++ b/pkg/shared/telemetry/type.go
@@ -1 +1,2 @@
+// Placeholder file. Required for windows build and lint.
 package telemetry