diff --git a/compose/docker-compose.ee.yml b/compose/docker-compose.ee.yml
index b671ef00..4307ca9c 100644
--- a/compose/docker-compose.ee.yml
+++ b/compose/docker-compose.ee.yml
@@ -17,7 +17,6 @@ services:
       DNS_MODE: "on"
       SERVER_HTTP_HOST: "api.NETMAKER_BASE_DOMAIN"
       API_PORT: "8081"
-      CLIENT_MODE: "on"
       MASTER_KEY: "REPLACE_MASTER_KEY"
       CORS_ALLOWED_ORIGIN: "*"
       DISPLAY_KEYS: "on"
diff --git a/config/config.go b/config/config.go
index aee8c3cb..833687af 100644
--- a/config/config.go
+++ b/config/config.go
@@ -44,7 +44,6 @@ type ServerConfig struct {
 	RestBackend           string `yaml:"restbackend"`
 	AgentBackend          string `yaml:"agentbackend"`
 	MessageQueueBackend   string `yaml:"messagequeuebackend"`
-	ClientMode            string `yaml:"clientmode"`
 	DNSMode               string `yaml:"dnsmode"`
 	DisableRemoteIPCheck  string `yaml:"disableremoteipcheck"`
 	Version               string `yaml:"version"`
diff --git a/config/environments/dev.yaml b/config/environments/dev.yaml
index 8142423c..4107c468 100644
--- a/config/environments/dev.yaml
+++ b/config/environments/dev.yaml
@@ -5,7 +5,6 @@ server:
   allowedorigin: "" # defaults to '*' or CORS_ALLOWED_ORIGIN (if set)
   restbackend: "" # defaults to "on" or REST_BACKEND (if set)
   agentbackend: "" # defaults to "on" or AGENT_BACKEND (if set)
-  clientmode: "" # defaults to "on" or CLIENT_MODE (if set)
   dnsmode: "" # defaults to "on" or DNS_MODE (if set)
   sqlconn: "" # defaults to "http://" or SQL_CONN (if set)
   disableremoteipcheck: "" # defaults to "false" or DISABLE_REMOTE_IP_CHECK (if set)
diff --git a/dev.yaml b/dev.yaml
index 01fe64d0..86c14f9f 100644
--- a/dev.yaml
+++ b/dev.yaml
@@ -15,7 +15,6 @@ server:
   restbackend: "on"
   agentbackend: "on"
   messagequeuebackend: "on"
-  clientmode: "on"
   dnsmode: "on"
   disableremoteipcheck: ""
   grpcssl: "on"
diff --git a/k8s/server/netmaker-server.yaml b/k8s/server/netmaker-server.yaml
index 2c0a94d6..635fef13 100644
--- a/k8s/server/netmaker-server.yaml
+++ b/k8s/server/netmaker-server.yaml
@@ -53,8 +53,6 @@ spec:
           value: wireguard-go
         - name: DNS_MODE
           value: "off"
-        - name: CLIENT_MODE
-          value: "on"
         - name: DISPLAY_KEYS
           value: "on"
         - name: DATABASE
diff --git a/main.go b/main.go
index b17873c9..311856c8 100644
--- a/main.go
+++ b/main.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/signal"
 	"runtime/debug"
-	"strconv"
 	"sync"
 	"syscall"
 
@@ -97,20 +96,6 @@ func initialize() { // Client Mode Prereq Check
 		logger.FatalLog("error setting defaults: ", err.Error())
 	}
 
-	if servercfg.IsClientMode() != "off" {
-		output, err := ncutils.RunCmd("id -u", true)
-		if err != nil {
-			logger.FatalLog("Error running 'id -u' for prereq check. Please investigate or disable client mode.", output, err.Error())
-		}
-		uid, err := strconv.Atoi(string(output[:len(output)-1]))
-		if err != nil {
-			logger.FatalLog("Error retrieving uid from 'id -u' for prereq check. Please investigate or disable client mode.", err.Error())
-		}
-		if uid != 0 {
-			logger.FatalLog("To run in client mode requires root privileges. Either disable client mode or run with sudo.")
-		}
-	}
-
 	if servercfg.IsDNSMode() {
 		err := functions.SetDNSDir()
 		if err != nil {
diff --git a/models/structs.go b/models/structs.go
index 0f57102e..92f7ac15 100644
--- a/models/structs.go
+++ b/models/structs.go
@@ -227,7 +227,6 @@ type ServerConfig struct {
 	CoreDNSAddr string `yaml:"corednsaddr"`
 	API         string `yaml:"api"`
 	APIPort     string `yaml:"apiport"`
-	ClientMode  string `yaml:"clientmode"`
 	DNSMode     string `yaml:"dnsmode"`
 	Version     string `yaml:"version"`
 	MQPort      string `yaml:"mqport"`
diff --git a/netclient/ncutils/netclientutils.go b/netclient/ncutils/netclientutils.go
index 7ef96b06..a12df93d 100644
--- a/netclient/ncutils/netclientutils.go
+++ b/netclient/ncutils/netclientutils.go
@@ -61,13 +61,6 @@ const DEFAULT_GC_PERCENT = 10
 // KEY_SIZE = ideal length for keys
 const KEY_SIZE = 2048
 
-// constants for random strings
-const (
-	letterIdxBits = 6                    // 6 bits to represent a letter index
-	letterIdxMask = 1<<letterIdxBits - 1 // All 1-bits, as many as letterIdxBits
-	letterIdxMax  = 63 / letterIdxBits   // # of letter indices fitting in 63 bits
-)
-
 // SetVersion -- set netclient version for use by other packages
 func SetVersion(ver string) {
 	Version = ver
diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go
index d592d907..bb252d55 100644
--- a/servercfg/serverconf.go
+++ b/servercfg/serverconf.go
@@ -50,10 +50,6 @@ func GetServerConfig() config.ServerConfig {
 	if IsAgentBackend() {
 		cfg.AgentBackend = "on"
 	}
-	cfg.ClientMode = "off"
-	if IsClientMode() != "off" {
-		cfg.ClientMode = IsClientMode()
-	}
 	cfg.DNSMode = "off"
 	if IsDNSMode() {
 		cfg.DNSMode = "on"
@@ -345,18 +341,6 @@ func IsMessageQueueBackend() bool {
 	return ismessagequeue
 }
 
-// IsClientMode - checks if it should run in client mode
-func IsClientMode() string {
-	isclient := "on"
-	if os.Getenv("CLIENT_MODE") == "off" {
-		isclient = "off"
-	}
-	if config.Config.Server.ClientMode == "off" {
-		isclient = "off"
-	}
-	return isclient
-}
-
 // Telemetry - checks if telemetry data should be sent
 func Telemetry() string {
 	telemetry := "on"
diff --git a/swagger.yaml b/swagger.yaml
index d2e732cd..bcbe8029 100644
--- a/swagger.yaml
+++ b/swagger.yaml
@@ -575,8 +575,6 @@ definitions:
                 type: string
             ClientID:
                 type: string
-            ClientMode:
-                type: string
             ClientSecret:
                 type: string
             CoreDNSAddr: