diff --git a/.gitignore b/.gitignore
index 18da4b52..defe793f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,5 +16,3 @@ netclient/netclient.exe
 config/dnsconfig/
 data/
 .vscode/
-.idea/
-.vscode/
diff --git a/config/config.go b/config/config.go
index 649ef1b9..044d1a88 100644
--- a/config/config.go
+++ b/config/config.go
@@ -43,14 +43,12 @@ type ServerConfig struct {
 	GRPCHost              string `yaml:"grpchost"`
 	GRPCPort              string `yaml:"grpcport"`
 	GRPCSecure            string `yaml:"grpcsecure"`
-	MQHOST                string `yaml:"mqhost"`
 	MasterKey             string `yaml:"masterkey"`
 	DNSKey                string `yaml:"dnskey"`
 	AllowedOrigin         string `yaml:"allowedorigin"`
 	NodeID                string `yaml:"nodeid"`
 	RestBackend           string `yaml:"restbackend"`
 	AgentBackend          string `yaml:"agentbackend"`
-	MessageQueueBackend   string `yaml:"messagequeuebackend"`
 	ClientMode            string `yaml:"clientmode"`
 	DNSMode               string `yaml:"dnsmode"`
 	SplitDNS              string `yaml:"splitdns"`
@@ -71,7 +69,6 @@ type ServerConfig struct {
 	FrontendURL           string `yaml:"frontendurl"`
 	DisplayKeys           string `yaml:"displaykeys"`
 	AzureTenant           string `yaml:"azuretenant"`
-	RCE                   string `yaml:"rce"`
 }
 
 // SQLConfig - Generic SQL Config
diff --git a/netclient/command/commands.go b/netclient/command/commands.go
index 60a35e7f..1aecdb4b 100644
--- a/netclient/command/commands.go
+++ b/netclient/command/commands.go
@@ -215,8 +215,3 @@ func Daemon() error {
 	err := functions.Daemon()
 	return err
 }
-
-func Daemon() error {
-	err := functions.Daemon()
-	return err
-}
diff --git a/netclient/ncutils/netclientutils_linux.go b/netclient/ncutils/netclientutils_linux.go
index e4cbb1c7..bc4c399e 100644
--- a/netclient/ncutils/netclientutils_linux.go
+++ b/netclient/ncutils/netclientutils_linux.go
@@ -34,7 +34,7 @@ func GetEmbedded() error {
 }
 
 // CreateWireGuardConf - creates a user space WireGuard conf
-func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, peers []wgtypes.PeerConfig) (string, error) {
+func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, dns string, peers []wgtypes.PeerConfig) (string, error) {
 	peersString, err := parsePeers(node.PersistentKeepalive, peers)
 	var listenPortString, postDownString, postUpString string
 	if node.MTU <= 0 {
@@ -56,6 +56,7 @@ func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string
 	}
 	config := fmt.Sprintf(`[Interface]
 Address = %s
+DNS = %s
 PrivateKey = %s
 MTU = %s
 %s
@@ -66,6 +67,7 @@ MTU = %s
 
 `,
 		node.Address+"/32",
+		dns,
 		privatekey,
 		strconv.Itoa(int(node.MTU)),
 		postDownString,