diff --git a/nucleus/controller.go b/nucleus/controller.go
index f9e2b6dd968e54172a8a1db92fe5850f107dfa5d..362358f37162438a5e120e9623a3d4937e2dc651 100644
--- a/nucleus/controller.go
+++ b/nucleus/controller.go
@@ -27,8 +27,8 @@ var c *Core
 func init() {
 	c = &Core{
 		database:   database.Database{},
-		pndc:       pndStore{},
-		sbic:       sbiStore{},
+		pndc:       pndStore{store{}},
+		sbic:       sbiStore{store{}},
 		stopChan:   make(chan os.Signal, 1),
 	}
 
@@ -38,13 +38,6 @@ func init() {
 
 // initialize does start-up housekeeping like reading controller config files
 func initialize() error {
-	c.sbic = sbiStore{
-		store{},
-	}
-	c.pndc = pndStore{
-		store{},
-	}
-
 	if err := createSouthboundInterfaces(); err != nil {
 		return err
 	}
diff --git a/nucleus/http_test.go b/nucleus/http_test.go
index 87e744773b97d34e9bf48be8dc7c9c6272cccf48..9da520a2466c57f5442cc7fc63a056db3a567654 100644
--- a/nucleus/http_test.go
+++ b/nucleus/http_test.go
@@ -11,7 +11,6 @@ import (
 )
 
 func testSetupHttp() {
-	testSetupPnd()
 	sbi = &OpenConfig{id: defaultSbiID}
 	sbi.Schema()
 	var err error
@@ -31,11 +30,6 @@ func testSetupHttp() {
 	}
 	args = "&uuid=" + mdid.String() + "&pnd=" + defaultPndID.String() + "&sbi=" + defaultSbiID.String()
 	argsNotFound = "&uuid=" + uuid.New().String() + "&pnd=" + defaultPndID.String() + "&sbi=" + defaultSbiID.String()
-
-	c = &Core{
-		pndc: pndStore{store{}},
-		sbic: sbiStore{store{}},
-	}
 	if err := c.sbic.add(sbi); err != nil {
 		log.Fatal(err)
 	}