diff --git a/watcher_latency.go b/watcher_latency.go
index 1d720949..7d0bc7ac 100644
--- a/watcher_latency.go
+++ b/watcher_latency.go
@@ -61,8 +61,8 @@ func (lw *LatencyWatcher) refresh(o *Observer, infoKeys []string, rawMetrics map
 	}
 
 	// loop all the latency infokeys
-	for ik := range infoKeys {
-		err := parseSingleLatenciesKey(infoKeys[ik], rawMetrics, allowedLatenciesList, blockedLatenciessList, ch)
+	for _, infoKey := range infoKeys {
+		err := parseSingleLatenciesKey(infoKey, rawMetrics, allowedLatenciesList, blockedLatenciessList, ch)
 		if err != nil {
 			return err
 		}
@@ -130,10 +130,7 @@ func isStatLatencyHistRelated(stat string) bool {
 func (lw *LatencyWatcher) getLatenciesCommands(rawMetrics map[string]string) []string {
 	var commands = []string{"latencies:"}
 
-	// below latency-command are added to the auto-enabled list, i.e. latencies: command
-	// re-repl is auto-enabled, but not coming as part of latencies: list, hence we are adding it explicitly
-	//
-	// Hashmap content format := namespace-<histogram-key> = <0/1>
+	// Hashmap content format := namespace-<histogram-key> = <histogram-key>
 	for latencyHistName := range LatencyBenchmarks {
 		histTokens := strings.Split(latencyHistName, "-")
 
diff --git a/watcher_namespaces.go b/watcher_namespaces.go
index 8d061cf2..13231c54 100644
--- a/watcher_namespaces.go
+++ b/watcher_namespaces.go
@@ -219,10 +219,10 @@ func (nw *NamespaceWatcher) refreshNamespaceStats(singleInfoKey string, infoKeys
 				LatencyBenchmarks[nsName+"-"+stat] = stat
 			}
 		}
-		// append default re-repl, as this auto-enabled, but not coming as part of latencies, we need this as namespace is available only here
-		LatencyBenchmarks[nsName+"-latency-hist-re-repl"] = "{" + nsName + "}-re-repl"
 
 	}
+	// // append default re-repl, as this auto-enabled, but not coming as part of latencies, we need this as namespace is available only here
+	// LatencyBenchmarks[nsName+"-latency-hist-re-repl"] = "{" + nsName + "}-re-repl"
 
 }