diff --git a/controller/api/initialise_test.go b/controller/api/initialise_test.go
index 572a9baafe5aef6cfcbeab0e5ec947c50637684d..867581cd8409ba97de1aba637b66aaf435032ade 100644
--- a/controller/api/initialise_test.go
+++ b/controller/api/initialise_test.go
@@ -235,7 +235,6 @@ func bootstrapUnitTest() {
 		rpb.NewPluginRegistryServiceClient(&grpc.ClientConn{}),
 		csbi.NewCsbiServiceClient(&grpc.ClientConn{}),
 		func(u uuid.UUID, c chan networkelement.Details) {},
-		&mockPnd,
 	)
 
 	cpb.RegisterCoreServiceServer(s, northbound.Core)
diff --git a/controller/controller.go b/controller/controller.go
index 78c14d1bcbd4349a1c930c80edc53e05311d75b3..ea90a12dc5e599d682131d0a407fc3a92863862d 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -199,11 +199,6 @@ func startGrpc() error {
 	jwtManager := rbacImpl.NewJWTManager(config.JWTSecret, config.JWTDuration)
 	setupGRPCServerWithCorrectSecurityLevel(jwtManager, c.userService, c.roleService)
 
-	basePnd, err := c.pndService.Get(store.Query{ID: config.BasePndUUID})
-	if err != nil {
-		panic(err)
-	}
-
 	c.nbi = nbi.NewNBI(
 		c.pndStore,
 		c.pndService,
@@ -221,7 +216,6 @@ func startGrpc() error {
 		c.pluginRegistryClient,
 		c.csbiClient,
 		callback,
-		basePnd,
 	)
 
 	pb.RegisterCoreServiceServer(c.grpcServer, c.nbi.Core)
diff --git a/controller/northbound/server/nbi.go b/controller/northbound/server/nbi.go
index 6a041bcf43301d516a4d697f86538cfaae61cc72..72bdc63014dfb7fea372377522d2d2656e422f85 100644
--- a/controller/northbound/server/nbi.go
+++ b/controller/northbound/server/nbi.go
@@ -58,7 +58,6 @@ func NewNBI(
 	pluginRegistryClient rpb.PluginRegistryServiceClient,
 	csbiClient cpb.CsbiServiceClient,
 	pndCallbackFn func(uuid.UUID, chan networkelement.Details),
-	networkDomain networkdomain.NetworkDomain,
 ) *NorthboundInterface {
 	return &NorthboundInterface{
 		Pnd:                     NewPndServer(pndService),