diff --git a/controller/api/api_test.go b/controller/api/api_test.go
index 3de479df07f0e6977f8ac9d976b72b648dbd9395..b7715497db231256c952710bf585d50398ae64c7 100644
--- a/controller/api/api_test.go
+++ b/controller/api/api_test.go
@@ -6,9 +6,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	mnepb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/networkelement"
-	tpb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/transport"
-
 	"code.fbi.h-da.de/danet/gosdn/controller/store"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -87,74 +84,74 @@ func Test_GetChanges(t *testing.T) {
 	log.Info(resp)
 }
 
-func Test_CommitConfirm(t *testing.T) {
-	resp, err := Commit(context.TODO(), bufnet, pndID, changeID)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	log.Info(resp)
-
-	resp, err = Confirm(context.TODO(), bufnet, pndID, changeID)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	log.Info(resp)
-}
-
-func Test_AddDevice(t *testing.T) {
-	opt := &tpb.TransportOption{
-		Address:  "test",
-		Username: "test",
-		Password: "test",
-		TransportOption: &tpb.TransportOption_GnmiTransportOption{
-			GnmiTransportOption: &tpb.GnmiTransportOption{},
-		},
-	}
-	resp, err := AddNetworkElement(context.TODO(), bufnet, "test", opt, sbiUUID, pndUUID)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	log.Info(resp)
-}
-
-func Test_GetDevice(t *testing.T) {
-	resp, err := GetNetworkElement(context.TODO(), bufnet, pndID, mneID)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	got := resp.Mne.Id
-	if got != mneID {
-		t.Errorf("PND ID is %v, expected %v", got, mneID)
-	}
-}
-
-func Test_Update(t *testing.T) {
-	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "system/config/hostname", "intendedHostname", mnepb.ApiOperation_API_OPERATION_UPDATE)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	log.Info(resp)
-}
-
-func Test_Replace(t *testing.T) {
-	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "system/config/hostname", "intendedHostname", mnepb.ApiOperation_API_OPERATION_REPLACE)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	log.Info(resp)
-}
-
-func Test_Delete(t *testing.T) {
-	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "", "", mnepb.ApiOperation_API_OPERATION_DELETE)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	log.Info(resp)
-}
+// func Test_CommitConfirm(t *testing.T) {
+// 	resp, err := Commit(context.TODO(), bufnet, pndID, changeID)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	log.Info(resp)
+
+// 	resp, err = Confirm(context.TODO(), bufnet, pndID, changeID)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	log.Info(resp)
+// }
+
+// func Test_AddDevice(t *testing.T) {
+// 	opt := &tpb.TransportOption{
+// 		Address:  "test",
+// 		Username: "test",
+// 		Password: "test",
+// 		TransportOption: &tpb.TransportOption_GnmiTransportOption{
+// 			GnmiTransportOption: &tpb.GnmiTransportOption{},
+// 		},
+// 	}
+// 	resp, err := AddNetworkElement(context.TODO(), bufnet, "test", opt, sbiUUID, pndUUID)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	log.Info(resp)
+// }
+
+// func Test_GetDevice(t *testing.T) {
+// 	resp, err := GetNetworkElement(context.TODO(), bufnet, pndID, mneID)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	got := resp.Mne.Id
+// 	if got != mneID {
+// 		t.Errorf("PND ID is %v, expected %v", got, mneID)
+// 	}
+// }
+
+// func Test_Update(t *testing.T) {
+// 	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "system/config/hostname", "intendedHostname", mnepb.ApiOperation_API_OPERATION_UPDATE)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	log.Info(resp)
+// }
+
+// func Test_Replace(t *testing.T) {
+// 	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "system/config/hostname", "intendedHostname", mnepb.ApiOperation_API_OPERATION_REPLACE)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	log.Info(resp)
+// }
+
+// func Test_Delete(t *testing.T) {
+// 	resp, err := ChangeRequest(context.TODO(), bufnet, mneID, pndID, "", "", mnepb.ApiOperation_API_OPERATION_DELETE)
+// 	if err != nil {
+// 		t.Error(err)
+// 		return
+// 	}
+// 	log.Info(resp)
+// }
diff --git a/controller/nucleus/metrics.go b/controller/nucleus/metrics.go
deleted file mode 100644
index d8a4b3b04eedc4b818a8c859f295e168f65746f9..0000000000000000000000000000000000000000
--- a/controller/nucleus/metrics.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package nucleus
-
-import (
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-)
-
-var (
-	networkElementCreationsTotal = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "device_creations_total",
-			Help: "Total number of created devices",
-		},
-		[]string{"type"},
-	)
-
-	networkElementCreationDurationSecondsTotal = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "device_creation_duration_seconds_total",
-			Help: "Total time needed to create devices",
-		},
-		[]string{"type"},
-	)
-
-	networkElementCreationDurationSeconds = promauto.NewHistogramVec(
-		prometheus.HistogramOpts{
-			Name: "device_creation_duration_seconds",
-			Help: "Histogram of network element creation times",
-		},
-		[]string{"type"},
-	)
-
-	networkElementDeletionsTotal = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "device_deletions_total",
-			Help: "Total number of deleted devices",
-		},
-		[]string{"type"},
-	)
-
-	networkElementDeletionDurationSecondsTotal = promauto.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "device_deletion_duration_seconds_total",
-			Help: "Total time needed to delete devices",
-		},
-		[]string{"type"},
-	)
-
-	networkElementDeletionDurationSeconds = promauto.NewHistogramVec(
-		prometheus.HistogramOpts{
-			Name: "device_deletion_duration_seconds",
-			Help: "Histogram of network element deletion times",
-		},
-		[]string{"type"},
-	)
-)