diff --git a/netclient/command/commands.go b/netclient/command/commands.go
index adaa0822..2a04a34c 100644
--- a/netclient/command/commands.go
+++ b/netclient/command/commands.go
@@ -27,9 +27,6 @@ func Join(cfg config.ClientConfig, privateKey string) error {
 
 	var err error
 	err = functions.JoinNetwork(cfg, privateKey)
-	if err != nil && cfg.Node.IsServer != "yes" { // make sure server side is cleaned up
-		return err
-	}
 	if err != nil && !cfg.DebugJoin {
 		if !strings.Contains(err.Error(), "ALREADY_INSTALLED") {
 			ncutils.PrintLog("error installing: "+err.Error(), 1)
diff --git a/netclient/daemon/systemd.go b/netclient/daemon/systemd.go
index 914c2f0c..5fdea1e9 100644
--- a/netclient/daemon/systemd.go
+++ b/netclient/daemon/systemd.go
@@ -112,16 +112,23 @@ func RemoveSystemDServices() error {
 		if err != nil {
 			log.Println(err)
 		}
-		_, err = ncutils.RunCmd("systemctl disable netclient.service", true)
-		_, err = ncutils.RunCmd("systemctl disable netclient.timer", true)
-		err = os.Remove("/etc/systemd/system/netclient.service")
-		err = os.Remove("/etc/systemd/system/netclient.timer")
-		if err != nil {
-			log.Println("Error removing file. Please investigate.")
-			log.Println(err)
+		ncutils.RunCmd("systemctl disable netclient.service", false)
+		ncutils.RunCmd("systemctl disable netclient.timer", false)
+		if ncutils.FileExists("/etc/systemd/system/netclient.service") {
+			err = os.Remove("/etc/systemd/system/netclient.service")
+			if err != nil {
+				ncutils.Log("Error removing /etc/systemd/system/netclient.service. Please investigate.")
+			}
 		}
-		_, _ = ncutils.RunCmd("systemctl daemon-reload", true)
-		_, _ = ncutils.RunCmd("systemctl reset-failed", true)
+		if ncutils.FileExists("/etc/systemd/system/netclient.timer") {
+			err = os.Remove("/etc/systemd/system/netclient.timer")
+			if err != nil {
+				ncutils.Log("Error removing /etc/systemd/system/netclient.timer. Please investigate.")
+			}
+		}
+		ncutils.RunCmd("systemctl daemon-reload", false)
+		ncutils.RunCmd("systemctl reset-failed", false)
+		ncutils.Log("removed systemd remnants if any existed")
 	}
 	return nil
 }