diff --git a/src/networkcontroller/networkcontroller.go b/src/networkcontroller/networkcontroller.go
deleted file mode 100644
index 2087ac74..00000000
--- a/src/networkcontroller/networkcontroller.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package networkcontroller
-
-import (
-	pb "github.com/linkernetworks/network-controller/messages"
-	"github.com/linkernetworks/vortex/src/entity"
-	"github.com/linkernetworks/vortex/src/kubernetes"
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	"time"
-)
-
-type NetworkController struct {
-	KubeCtl   *kubernetes.KubeCtl
-	ClientCtl pb.NetworkControlClient
-	Network   entity.Network
-	Context   context.Context
-}
-
-func New(kubeCtl *kubernetes.KubeCtl, network entity.Network) (*NetworkController, error) {
-	node, err := kubeCtl.GetNode(network.NodeName)
-	if err != nil {
-		return nil, err
-	}
-
-	var nodeIP string
-	for _, addr := range node.Status.Addresses {
-		if addr.Type == "ExternalIP" {
-			nodeIP = addr.Address
-			break
-		}
-	}
-
-	// Set up a connection to the server.
-	conn, err := grpc.Dial(nodeIP, grpc.WithInsecure())
-	if err != nil {
-		return nil, err
-	}
-	defer conn.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	defer cancel()
-
-	return &NetworkController{
-		KubeCtl:   kubeCtl,
-		ClientCtl: pb.NewNetworkControlClient(conn),
-		Network:   network,
-		Context:   ctx,
-	}, nil
-}
-
-func (nc *NetworkController) CreateNetwork() error {
-	for _, port := range nc.Network.PhysicalPorts {
-		_, err := nc.ClientCtl.AddPort(nc.Context, &pb.AddPortRequest{
-			BridgeName: nc.Network.BridgeName,
-			IfaceName:  port.Name})
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/src/serviceprovider/serviceprovider.go b/src/serviceprovider/serviceprovider.go
index b35f44d2..828a8595 100644
--- a/src/serviceprovider/serviceprovider.go
+++ b/src/serviceprovider/serviceprovider.go
@@ -43,16 +43,8 @@ func New(cf config.Config) *Container {
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
-	kubeconfig := filepath.Join(os.Getenv("HOME"), ".kube", "config")
-	k8s, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
-	if err != nil {
-		k8s, err = rest.InClusterConfig()
-		if err != nil {
-			panic(fmt.Errorf("Load the kubernetes config fail"))
-		}
-	}
-
-	clientset := kubernetes.NewForConfigOrDie(k8s)
+	logger.Infof("Connecting to prometheus: %s", cf.Prometheus.Url)
+	prometheus := prometheus.New(cf.Prometheus.Url)
 
 	kubeconfig := filepath.Join(os.Getenv("HOME"), ".kube", "config")
 	k8s, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
@@ -92,32 +84,11 @@ func NewForTesting(cf config.Config) *Container {
 	clientset := fakeclientset.NewSimpleClientset()
 
 	sp := &Container{
-		Config:  cf,
-		Redis:   redisService,
-		Mongo:   mongo,
-		KubeCtl: kubeCtl.New(clientset, "default"),
-	}
-
-	return sp
-}
-
-func NewForTesting(cf config.Config) *Container {
-	// setup logger configuration
-	logger.Setup(cf.Logger)
-
-	logger.Infof("Connecting to redis: %s", cf.Redis.Addr())
-	redisService := redis.New(cf.Redis)
-
-	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
-	mongo := mongo.New(cf.Mongo.Url)
-
-	clientset := fakeclientset.NewSimpleClientset()
-
-	sp := &Container{
-		Config:  cf,
-		Redis:   redisService,
-		Mongo:   mongo,
-		KubeCtl: kubeCtl.New(clientset, "default"),
+		Config:     cf,
+		Redis:      redisService,
+		Mongo:      mongo,
+		Prometheus: prometheus,
+		KubeCtl:    kubeCtl.New(clientset, "default"),
 	}
 
 	return sp