diff --git a/netenv/dbus_linux_mock.go b/netenv/dbus_linux_mock.go
deleted file mode 100644
index cb0084c3..00000000
--- a/netenv/dbus_linux_mock.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !linux
-
-package netenv
-
-func getNameserversFromDbus() ([]Nameserver, error) {
-	var nameservers []Nameserver
-	return nameservers, nil
-}
-
-func getConnectivityStateFromDbus() (OnlineStatus, error) {
-	return StatusUnknown, nil
-}
diff --git a/netenv/environment.go b/netenv/environment.go
index 59fb3f83..09fda8a4 100644
--- a/netenv/environment.go
+++ b/netenv/environment.go
@@ -2,8 +2,6 @@ package netenv
 
 import (
 	"net"
-	"sync"
-	"time"
 )
 
 // TODO: find a good way to identify a network
@@ -15,25 +13,6 @@ import (
 // windows: https://msdn.microsoft.com/en-us/library/windows/desktop/aa365917
 // this info might already be included in the interfaces api provided by golang!
 
-const (
-	gatewaysRecheck    = 2 * time.Second
-	nameserversRecheck = 2 * time.Second
-)
-
-var (
-	// interfaces        = make(map[*net.IP]net.Flags)
-	// interfacesLock    sync.Mutex
-	// interfacesExpires = time.Now()
-
-	gateways        = make([]*net.IP, 0)
-	gatewaysLock    sync.Mutex
-	gatewaysExpires = time.Now()
-
-	nameservers        = make([]Nameserver, 0)
-	nameserversLock    sync.Mutex
-	nameserversExpires = time.Now()
-)
-
 // Nameserver describes a system assigned namserver.
 type Nameserver struct {
 	IP     net.IP
diff --git a/netenv/environment_linux.go b/netenv/environment_linux.go
index 363443f2..f704e8d5 100644
--- a/netenv/environment_linux.go
+++ b/netenv/environment_linux.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"os"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/miekg/dns"
@@ -14,7 +15,22 @@ import (
 	"github.com/safing/portmaster/network/netutils"
 )
 
-// Gateways returns the currently active gateways
+const (
+	gatewaysRecheck    = 2 * time.Second
+	nameserversRecheck = 2 * time.Second
+)
+
+var (
+	gateways        = make([]*net.IP, 0)
+	gatewaysLock    sync.Mutex
+	gatewaysExpires = time.Now()
+
+	nameservers        = make([]Nameserver, 0)
+	nameserversLock    sync.Mutex
+	nameserversExpires = time.Now()
+)
+
+// Gateways returns the currently active gateways.
 func Gateways() []*net.IP {
 	// locking
 	gatewaysLock.Lock()
@@ -101,7 +117,7 @@ func Gateways() []*net.IP {
 	return newGateways
 }
 
-// Nameservers returns the currently active nameservers
+// Nameservers returns the currently active nameservers.
 func Nameservers() []Nameserver {
 	// locking
 	nameserversLock.Lock()
diff --git a/netenv/environment_windows.go b/netenv/environment_windows.go
index 4f40e3e5..c2bc4e81 100644
--- a/netenv/environment_windows.go
+++ b/netenv/environment_windows.go
@@ -2,10 +2,12 @@ package netenv
 
 import "net"
 
+// Nameservers returns the currently active nameservers.
 func Nameservers() []Nameserver {
 	return nil
 }
 
+// Gateways returns the currently active gateways.
 func Gateways() []*net.IP {
 	return nil
 }