diff --git a/integrations/Unity3D/Assets/ZeroTierSockets_Demo.cs b/integrations/Unity3D/Assets/ZeroTierSockets_Demo.cs
index f1f4d46..cc24e8c 100644
--- a/integrations/Unity3D/Assets/ZeroTierSockets_Demo.cs
+++ b/integrations/Unity3D/Assets/ZeroTierSockets_Demo.cs
@@ -222,7 +222,7 @@ public class ZeroTierSockets_Demo : MonoBehaviour
 		GameObject go;
 		go = GameObject.Find ("inputNetworkID"); 
 		input = go.GetComponents<InputField> () [0];
-		input.text = "565799d8f65063e5";
+		input.text = "XXXXXXXXXXXXXXXX";
 		go = GameObject.Find ("inputServerAddress"); 
 		input = go.GetComponents<InputField> () [0];
 		input.text = "10.9.9.203";
@@ -234,7 +234,7 @@ public class ZeroTierSockets_Demo : MonoBehaviour
 		input.text = "Welcome to the machine";
 
 		// Create new instance of ZeroTier in separate thread
-		zt = new ZeroTierNetworkInterface ("/Users/Joseph/utest3", "565799d8f65063e5");
+		zt = new ZeroTierNetworkInterface ("/Users/ztest", "XXXXXXXXXXXXXXXX");
 	}
 
 	// Terminate the ZeroTier service when the application quits
diff --git a/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java
index 1390c25..e59c8ca 100644
--- a/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java
+++ b/integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java
@@ -32,45 +32,21 @@ public class MainActivity extends AppCompatActivity {
         Log.d("SDK", "Starting service...\n");
         while(!zt.isRunning()) { }
         Log.d("SDK","Joining network...\n");
-        zt.joinNetwork("565799d8f65063e5");
-
-/*
-        final Handler handler = new Handler();
-        handler.postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                //Do something after 100ms
-            }
-        }, 10000);
-*/
-
-
-
+        zt.joinNetwork("XXXXXXXXXXXXXXXX");
 
         // Create ZeroTier socket
         Log.d("","ztjniSocket()\n");
         int sock = zt.ztjniSocket(zt.AF_INET, zt.SOCK_STREAM, 0);
         Log.d("", "ztjniSocket() = " + sock + "\n");
 
-
-        // Construct remote host address
-        //InetAddress addr = InetAddress.getByName("10.144.211.245");
-        //int port = 8080;
-        //SocketAddress sockaddr = new InetSocketAddress(addr, port);
-
-        try
-        {
-            Thread.sleep(15000);
-        }
-        catch(java.lang.InterruptedException e)
-        {
-
+        try {
+            Thread.sleep(10000);
         }
+        catch(java.lang.InterruptedException e) { }
 
         // Connect to remote host
         Log.d("","ztjniConnect()\n");
         int err = zt.ztjniConnect(sock, "10.9.9.203", 8080);
-        Log.d("", "ztjniConnect() = " + err + "\n");
 
         // Set up example proxy connection to SDK proxy server
         /*
diff --git a/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift b/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift
index 659c37c..f7e8195 100644
--- a/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift
+++ b/integrations/apple/example_app/OSX/Example_OSX_App/ViewController.swift
@@ -272,9 +272,9 @@ class ViewController: NSViewController {
     var service_thread : NSThread!
     func ztnc_start_service() {
         // If you plan on using SOCKS Proxy, you don't need to initialize the RPC
-        //start_service("/Users/Joseph/utest3")
+        //start_service("/Users/ztest")
         // If you plan on using direct calls via RPC
-        start_service_and_rpc("/Users/Joseph/utest3","565799d8f65063e5");
+        start_service_and_rpc("/Users/ztest","XXXXXXXXXXXXXXXX");
     }
     
     
@@ -284,7 +284,7 @@ class ViewController: NSViewController {
         // Set initial UI values for demo
         txtAddr.stringValue = serverAddr
         txtPort.intValue = serverPort
-        txtNWID.stringValue = "565799d8f65063e5"
+        txtNWID.stringValue = "XXXXXXXXXXXXXXXX"
         
         // ZeroTier Service thread
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), {
diff --git a/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift b/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
index 7e31c80..6bfb3dd 100644
--- a/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
+++ b/integrations/apple/example_app/iOS/Example_iOS_App/ViewController.swift
@@ -216,13 +216,13 @@ class ViewController: UIViewController {
     var service_thread : NSThread!
     func ztnc_start_service() {
         let path = NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.DocumentDirectory, NSSearchPathDomainMask.UserDomainMask, true)
-        start_service_and_rpc(path[0],"565799d8f65063e5")
+        start_service_and_rpc(path[0],"XXXXXXXXXXXXXXXX")
     }
 
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        txtNWID.text = "565799d8f65063e5"
+        txtNWID.text = "XXXXXXXXXXXXXXXX"
         txtTX.text = "welcome to the machine"
         txtAddr.text = "0.0.0.0"
         serverAddr = "0.0.0.0"
diff --git a/integrations/docker/docker_demo/565799d8f65063e5.conf b/integrations/docker/docker_demo/XXXXXXXXXXXXXXXX.conf
similarity index 100%
rename from integrations/docker/docker_demo/565799d8f65063e5.conf
rename to integrations/docker/docker_demo/XXXXXXXXXXXXXXXX.conf
diff --git a/src/SDK_ServiceSetup.cpp b/src/SDK_ServiceSetup.cpp
index 79aaaf3..e9d0fb1 100644
--- a/src/SDK_ServiceSetup.cpp
+++ b/src/SDK_ServiceSetup.cpp
@@ -218,7 +218,6 @@ void zt_init_rpc(const char * path, const char * nwid);
             specific data directory given by getApplicationContext().getFilesDir() */
             //rpcDir = homeDir; // Take given homeDir as rpcDir
             //homeDir = "/sdcard/zerotier"; // Use fat32-formatted sdcard for writing network conf & supporting files
-            //join_network("565799d8f65063e5");
         #endif
 
         #if defined(__APPLE__) && !defined(__IOS__)
diff --git a/tests/docker/e5cd7a9e1c3511dd.conf b/tests/docker/XXXXXXXXXXXXXXXX.conf
similarity index 100%
rename from tests/docker/e5cd7a9e1c3511dd.conf
rename to tests/docker/XXXXXXXXXXXXXXXX.conf