diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts
index 3ebe861b20..f11187f8a1 100644
--- a/src/main/cluster-manager.ts
+++ b/src/main/cluster-manager.ts
@@ -87,10 +87,6 @@ export class ClusterManager {
 
   protected async addNewCluster(clusterData: ClusterBaseInfo): Promise<Cluster> {
     return new Promise(async (resolve, reject) => {
-
-      logger.info(`*******addNewCluster: ${JSON.stringify(clusterData)}`)
-
-
       try {
         const kc = this.loadKubeConfig(clusterData.kubeConfigPath)
         k8s.validateConfig(kc)
diff --git a/src/main/context-handler.ts b/src/main/context-handler.ts
index 9f527a9693..2e9dcb64a3 100644
--- a/src/main/context-handler.ts
+++ b/src/main/context-handler.ts
@@ -8,28 +8,24 @@ import { KubeAuthProxy } from "./kube-auth-proxy"
 import { Cluster, ClusterPreferences } from "./cluster"
 import { prometheusProviders } from "../common/prometheus-providers"
 import { PrometheusService, PrometheusProvider } from "./prometheus/provider-registry"
-import { PrometheusLens } from "./prometheus/lens"
-import { KubeconfigManager } from "./kubeconfig-manager"
 
 export class ContextHandler {
   public contextName: string
   public id: string
   public url: string
-  
+  public clusterUrl: url.UrlWithStringQuery
+  public proxyServer: KubeAuthProxy
+  public proxyPort: number
   public certData: string
   public authCertData: string
   public cluster: Cluster
 
   protected apiTarget: ServerOptions
   protected proxyTarget: ServerOptions
-  public clusterUrl: url.UrlWithStringQuery
-  public proxyServer: KubeAuthProxy
-
   protected clientCert: string
   protected clientKey: string
   protected secureApiConnection = true
   protected defaultNamespace: string
-  public proxyPort: number
   protected kubernetesApi: string
   protected prometheusProvider: string
   protected prometheusPath: string
diff --git a/src/main/routes/watch.ts b/src/main/routes/watch.ts
index 4df98f5082..05e2afa849 100644
--- a/src/main/routes/watch.ts
+++ b/src/main/routes/watch.ts
@@ -59,7 +59,6 @@ class ApiWatcher {
   }
 
   private doneHandler(error: Error) {
-    logger.debug("********** watch.doneHandler")
     if (error) logger.warn("watch ended: " + error.toString())
 
     this.sendEvent({
@@ -96,7 +95,7 @@ class WatchRoute extends LensApi {
     logger.debug("watch using kubeconfig:" + JSON.stringify(cluster.proxyKubeconfig(), null, 2))
 
     apis.forEach(apiUrl => {
-      const watcher = new ApiWatcher(apiUrl, cluster.proxyKubeconfig() /*cluster.contextHandler.kc*/, response)
+      const watcher = new ApiWatcher(apiUrl, cluster.proxyKubeconfig(), response)
       watcher.start()
       watchers.push(watcher)
     })