diff --git a/go.mod b/go.mod
index 72d38e8..2d75f1e 100644
--- a/go.mod
+++ b/go.mod
@@ -10,8 +10,8 @@ require (
 )
 
 require (
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
 )
diff --git a/go.sum b/go.sum
index 199b832..09bdb1d 100644
--- a/go.sum
+++ b/go.sum
@@ -24,12 +24,20 @@ go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
 golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 h1:pFyd6EwwL2TqFf8emdthzeX+gZE1ElRq3iM8pui4KBY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
 google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
diff --git a/services/controller_service/service.go b/services/controller_service/service.go
deleted file mode 100644
index fece8d8..0000000
--- a/services/controller_service/service.go
+++ /dev/null
@@ -1 +0,0 @@
-package marketdata
diff --git a/services/data_service/cmd/main.go b/services/data_service/cmd/main.go
index 74a21bf..134601a 100644
--- a/services/data_service/cmd/main.go
+++ b/services/data_service/cmd/main.go
@@ -21,11 +21,9 @@ func main() {
 
 	// gRPC Server
 	grpcServer := grpc.NewServer()
-	streamingServer := server.NewGRPCStreamingServer(m)
-	pb.RegisterDataServiceStreamingServer(grpcServer, streamingServer)
-	reflection.Register(grpcServer)
-
 	go func() {
+		pb.RegisterDataServiceStreamingServer(grpcServer, server.NewGRPCStreamingServer(m))
+		reflection.Register(grpcServer)
 		grpcLis, err := net.Listen("tcp", ":50051")
 		if err != nil {
 			log.Fatalf("Failed to listen for gRPC: %v", err)
diff --git a/services/data_service/internal/router/router.go b/services/data_service/internal/router/router.go
index 6e271bd..29820fc 100644
--- a/services/data_service/internal/router/router.go
+++ b/services/data_service/internal/router/router.go
@@ -34,7 +34,7 @@ func (r *Router) Run() {
 			select {
 			case ch <- msg:
 			default:
-				fmt.Println("Dropped message, buffer full!!!")
+				fmt.Println("Dropped message, buffer full!!!") // TODO: Handle full buffer case more gracefully
 			}
 		}
 		r.mu.RUnlock()
diff --git a/services/portfolio_service/service.go b/services/portfolio_service/service.go
deleted file mode 100644
index fece8d8..0000000
--- a/services/portfolio_service/service.go
+++ /dev/null
@@ -1 +0,0 @@
-package marketdata