diff --git a/source/kernel/kernel.go b/source/kernel/kernel.go
index e11d35987..41fe52398 100644
--- a/source/kernel/kernel.go
+++ b/source/kernel/kernel.go
@@ -34,8 +34,6 @@ type NFDConfig struct {
 	ConfigOpts  []string `json:"configOpts,omitempty"`
 }
 
-var logger = log.New(os.Stderr, "", log.LstdFlags)
-
 var Config = NFDConfig{
 	KconfigFile: "",
 	ConfigOpts: []string{
@@ -57,7 +55,7 @@ func (s Source) Discover() (source.Features, error) {
 	// Read kernel version
 	version, err := parseVersion()
 	if err != nil {
-		logger.Printf("ERROR: Failed to get kernel version: %s", err)
+		log.Printf("ERROR: Failed to get kernel version: %s", err)
 	} else {
 		for key := range version {
 			features["version."+key] = version[key]
@@ -67,7 +65,7 @@ func (s Source) Discover() (source.Features, error) {
 	// Read kconfig
 	kconfig, err := parseKconfig()
 	if err != nil {
-		logger.Printf("ERROR: Failed to read kconfig: %s", err)
+		log.Printf("ERROR: Failed to read kconfig: %s", err)
 	}
 
 	// Check flags
@@ -79,7 +77,7 @@ func (s Source) Discover() (source.Features, error) {
 
 	selinux, err := SelinuxEnabled()
 	if err != nil {
-		logger.Print(err)
+		log.Print(err)
 	} else if selinux {
 		features["selinux.enabled"] = true
 	}
@@ -142,7 +140,7 @@ func parseKconfig() (map[string]bool, error) {
 	if len(Config.KconfigFile) > 0 {
 		raw, err = ioutil.ReadFile(Config.KconfigFile)
 		if err != nil {
-			logger.Printf("ERROR: Failed to read kernel config from %s: %s", Config.KconfigFile, err)
+			log.Printf("ERROR: Failed to read kernel config from %s: %s", Config.KconfigFile, err)
 		}
 	}
 
@@ -150,7 +148,7 @@ func parseKconfig() (map[string]bool, error) {
 	if raw == nil {
 		raw, err = readKconfigGzip("/proc/config.gz")
 		if err != nil {
-			logger.Printf("Failed to read /proc/config.gz: %s", err)
+			log.Printf("Failed to read /proc/config.gz: %s", err)
 		}
 	}
 
diff --git a/source/local/local.go b/source/local/local.go
index af655d7b4..49381de71 100644
--- a/source/local/local.go
+++ b/source/local/local.go
@@ -33,7 +33,6 @@ import (
 var (
 	featureFilesDir = "/etc/kubernetes/node-feature-discovery/features.d/"
 	hookDir         = "/etc/kubernetes/node-feature-discovery/source.d/"
-	logger          = log.New(os.Stderr, "", log.LstdFlags)
 )
 
 // Implement FeatureSource interface
@@ -54,10 +53,10 @@ func (s Source) Discover() (source.Features, error) {
 
 	// Merge features from hooks and files
 	for k, v := range featuresFromHooks {
-			if old, ok := featuresFromFiles[k]; ok {
-				log.Printf("WARNING: overriding label '%s': value changed from '%s' to '%s'",
-					k, old, v)
-			}
+		if old, ok := featuresFromFiles[k]; ok {
+			log.Printf("WARNING: overriding label '%s': value changed from '%s' to '%s'",
+				k, old, v)
+		}
 		featuresFromFiles[k] = v
 	}
 
diff --git a/source/pci/pci.go b/source/pci/pci.go
index 5c35ff902..7d9d092ad 100644
--- a/source/pci/pci.go
+++ b/source/pci/pci.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"os"
 	"path"
 	"strings"
 
@@ -29,8 +28,6 @@ import (
 
 type pciDeviceInfo map[string]string
 
-var logger = log.New(os.Stderr, "", log.LstdFlags)
-
 type NFDConfig struct {
 	DeviceClassWhitelist []string `json:"deviceClassWhitelist,omitempty"`
 	DeviceLabelFields    []string `json:"deviceLabelFields,omitempty"`