diff --git a/internal/envoy/auth/oauth2_filter.go b/internal/envoy/auth/oauth2_filter.go
index 9054a499..1cf63a57 100644
--- a/internal/envoy/auth/oauth2_filter.go
+++ b/internal/envoy/auth/oauth2_filter.go
@@ -81,7 +81,7 @@ func NewFilterHTTPOAuth2(oauth2Options *options.OAuth2, args *parseAuthOptionsAr
 	}
 	authorizationEndpoint := oauth2Options.AuthorizationEndpoint
 
-	sdsConfig := makeConfigSourceSpecifier()
+	sdsConfig := makeConfigSource()
 
 	tokenSecret := &envoy_extensions_transport_sockets_tls_v3.SdsSecretConfig{
 		Name:      "client_secret_test_1",
@@ -176,7 +176,7 @@ func NewFilterHTTPOAuth2(oauth2Options *options.OAuth2, args *parseAuthOptionsAr
 	return anyOAuth2, nil
 }
 
-func makeConfigSourceSpecifier() *envoy_config_core_v3.ConfigSource {
+func makeConfigSource() *envoy_config_core_v3.ConfigSource {
 	return &envoy_config_core_v3.ConfigSource{
 		ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_Ads{
 			Ads: &envoy_config_core_v3.AggregatedConfigSource{},
diff --git a/internal/envoy/manager/cache_manager.go b/internal/envoy/manager/cache_manager.go
index eeeaf21a..ca0842bf 100644
--- a/internal/envoy/manager/cache_manager.go
+++ b/internal/envoy/manager/cache_manager.go
@@ -44,7 +44,7 @@ type cacheManager struct {
 func NewCacheManager(snapshotCache cache_v3.SnapshotCache, logger logr.Logger) *cacheManager {
 	return &cacheManager{
 		SnapshotCache: snapshotCache,
-		fleetSnapshot: map[string]*cache_v3.Snapshot{},
+		fleetSnapshot: make(map[string]*cache_v3.Snapshot),
 		mu:            sync.RWMutex{},
 		logger:        logger.WithName("CacheManager"),
 	}
diff --git a/internal/envoy/manager/envoy_callbacks.go b/internal/envoy/manager/envoy_callbacks.go
index 794471c6..6e00b1c3 100644
--- a/internal/envoy/manager/envoy_callbacks.go
+++ b/internal/envoy/manager/envoy_callbacks.go
@@ -64,17 +64,6 @@ func (c *Callbacks) OnDeltaStreamClosed(id int64) {
 func (c *Callbacks) OnStreamRequest(id int64, request *envoy_discovery_v3.DiscoveryRequest) error {
 	c.logger.Info("OnStreamRequest", "id", id, "request.TypeUrl", request.TypeUrl, "request.Node.Cluster", request.Node.Cluster, "request.Node.Id", request.Node.Id)
 
-	// if c.cacheManager.IsNodeExist(request.Node.Id) {
-	// 	return nil
-	// }
-
-	// TODO(MBana): Could someone please confirm why this is needed here.
-	// c.logger.V(1).Info("OnStreamRequest setting snapshot", "id", id, "request.TypeUrl", request.TypeUrl, "request.Node.Cluster", request.Node.Cluster, "request.Node.Id", request.Node.Id)
-	// if err := c.cacheManager.setNodeSnapshot(request.Node.Id, request.Node.Cluster); err != nil {
-	// 	c.logger.Error(err, "OnStreamRequest", "id", id, "request.TypeUrl", request.TypeUrl, "request.Node.Cluster", request.Node.Cluster, "request.Node.Id", request.Node.Id)
-	// 	return err
-	// }
-
 	return nil
 }