diff --git a/cni/ipam/plugin/main.go b/cni/ipam/plugin/main.go
index 1d5ec3b641..03e6f3bda2 100644
--- a/cni/ipam/plugin/main.go
+++ b/cni/ipam/plugin/main.go
@@ -10,7 +10,6 @@ import (
 	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cni/ipam"
 	"github.com/Azure/azure-container-networking/common"
-	"github.com/Azure/azure-container-networking/log"
 )
 
 const name = "azure-vnet-ipam"
@@ -23,17 +22,6 @@ func main() {
 	var config common.PluginConfig
 	config.Version = version
 
-	logDirectory := "" // Sets the current location as log directory
-
-	log.SetName(name)
-	log.SetLevel(log.LevelInfo)
-	if err := log.SetTargetLogDirectory(log.TargetLogfile, logDirectory); err != nil {
-		fmt.Printf("Failed to setup cni logging: %v\n", err)
-		return
-	}
-
-	defer log.Close()
-
 	ipamPlugin, err := ipam.NewPlugin(name, &config)
 	if err != nil {
 		fmt.Printf("Failed to create IPAM plugin, err:%v.\n", err)
diff --git a/cni/ipam/pluginv6/main.go b/cni/ipam/pluginv6/main.go
index 6e4f466eb9..627f68f2a9 100644
--- a/cni/ipam/pluginv6/main.go
+++ b/cni/ipam/pluginv6/main.go
@@ -10,7 +10,6 @@ import (
 	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cni/ipam"
 	"github.com/Azure/azure-container-networking/common"
-	"github.com/Azure/azure-container-networking/log"
 )
 
 const name = "azure-vnet-ipamv6"
@@ -23,17 +22,6 @@ func main() {
 	var config common.PluginConfig
 	config.Version = version
 
-	logDirectory := "" // Sets the current location as log directory
-
-	log.SetName(name)
-	log.SetLevel(log.LevelInfo)
-	if err := log.SetTargetLogDirectory(log.TargetLogfile, logDirectory); err != nil {
-		fmt.Printf("Failed to setup cni logging: %v\n", err)
-		return
-	}
-
-	defer log.Close()
-
 	ipamPlugin, err := ipam.NewPlugin(name, &config)
 	if err != nil {
 		fmt.Printf("Failed to create IPAM plugin, err:%v.\n", err)
diff --git a/cni/network/network.go b/cni/network/network.go
index 068c6cef87..46e92cc835 100644
--- a/cni/network/network.go
+++ b/cni/network/network.go
@@ -903,7 +903,7 @@ func (plugin *NetPlugin) Get(args *cniSkel.CmdArgs) error {
 
 	// Query the endpoint.
 	if epInfo, err = plugin.nm.GetEndpointInfo(networkID, endpointID); err != nil {
-		plugin.Errorf("Failed to query endpoint: %v", err)
+		logger.Error("Failed to query endpoint", zap.Error(err))
 		return err
 	}
 
diff --git a/cni/network/plugin/main.go b/cni/network/plugin/main.go
index 923e8cbd49..9c6a0d8178 100644
--- a/cni/network/plugin/main.go
+++ b/cni/network/plugin/main.go
@@ -17,7 +17,6 @@ import (
 	zaplog "github.com/Azure/azure-container-networking/cni/log"
 	"github.com/Azure/azure-container-networking/cni/network"
 	"github.com/Azure/azure-container-networking/common"
-	"github.com/Azure/azure-container-networking/log"
 	"github.com/Azure/azure-container-networking/nns"
 	"github.com/Azure/azure-container-networking/platform"
 	"github.com/Azure/azure-container-networking/store"
@@ -295,15 +294,6 @@ func main() {
 		os.Exit(0)
 	}
 
-	log.SetName(name)
-	log.SetLevel(log.LevelInfo)
-	if err := log.SetTargetLogDirectory(log.TargetLogfile, ""); err != nil {
-		fmt.Printf("Failed to setup cni logging: %v\n", err)
-		return
-	}
-
-	defer log.Close()
-
 	if rootExecute() != nil {
 		os.Exit(1)
 	}