diff --git a/_src/_assets/javascripts/page-getstarted.js b/_src/_assets/javascripts/page-getstarted.js
index 6970cbb..22a5435 100644
--- a/_src/_assets/javascripts/page-getstarted.js
+++ b/_src/_assets/javascripts/page-getstarted.js
@@ -4,7 +4,6 @@
 //=include bigchain/newsletter.js
 
 const bigchaindbUrl = 'https://test.bigchaindb.com'
-const proxyUrl = 'https://getstarted.bigchaindb.com'
 const apiPath = '/api/v1/'
 
 jQuery(function ($) {
@@ -81,7 +80,7 @@ window.addEventListener('DOMContentLoaded', function domload(event) {
     window.removeEventListener('DOMContentLoaded', domload, false)
 
     const driver = window.BigchainDB
-    const API_PATH = proxyUrl + apiPath
+    const API_PATH = bigchaindbUrl + apiPath
 
     const postButton = document.getElementById('post')
     const postButtonText = postButton.innerText
diff --git a/_src/_data/getstarted.yml b/_src/_data/getstarted.yml
index b7ea4c7..971b765 100644
--- a/_src/_data/getstarted.yml
+++ b/_src/_data/getstarted.yml
@@ -23,16 +23,16 @@ server:
     network:
         pretitle: "Managed"
         title: "The BigchainDB Test Network"
-        version_title: "Test Network is currently running on BigchainDB "
-        description: "No installation needed. Sign up and connect instantly, we will handle running a BigchainDB network for you."
-        button: "Sign up"
-        link: "https://testnet.bigchaindb.com"
+        version_title: "The BigchainDB Test Network is currently running on BigchainDB "
+        description: "No installation needed. We handle running a BigchainDB network for you."
+        button: "Visit the Test Network"
+        link: "https://test.bigchaindb.com"
     bdb:
         pretitle: "Self-Hosted"
         title: "BigchainDB Server"
-        description: "If you want to run your own BigchainDB instance, you can either get set up on Linux or with Docker on any system."
-        button: "Install BigchainDB Server"
-        link: "https://docs.bigchaindb.com/projects/server/en/latest/quickstart.html"
+        description: "If you want to deploy and run your own BigchainDB node or network, you can."
+        button: "Deploy a BigchainDB node"
+        link: "http://docs.bigchaindb.com/projects/server/en/latest/simple-deployment-template/index.html"
 
 
 # ----------------------------
diff --git a/_src/_guide/_setup.md b/_src/_guide/_setup.md
index f2bb5a3..501cbd1 100644
--- a/_src/_guide/_setup.md
+++ b/_src/_guide/_setup.md
@@ -21,30 +21,22 @@ pip install -U bigchaindb-driver
 </dependency>
 ```
 
-Then, include that as a module and connect to any BigchainDB node. You can create your own `app_id` and `app_key` on [BigchainDB Testnet](https://testnet.bigchaindb.com).
+Then, include that as a module and connect to any BigchainDB node.
 
 ```js
 const BigchainDB = require('bigchaindb-driver')
 
-const API_PATH = 'https://test.bigchaindb.com/api/v1/'
-const conn = new BigchainDB.Connection(API_PATH, {
-    app_id: 'Get one from testnet.bigchaindb.com',
-    app_key: 'Get one from testnet.bigchaindb.com'
-})
+const API_PATH = '{{ site.bigchaindb_api_url }}/api/v1/'
+const conn = new BigchainDB.Connection(API_PATH)
 ```
 
 ```python
 from bigchaindb_driver import BigchainDB
 
-conn = BigchainDB(
-    'https://test.bigchaindb.com',
-    headers={'app_id': 'Get one from testnet.bigchaindb.com',
-             'app_key': 'Get one from testnet.bigchaindb.com'})
+conn = BigchainDB('{{ site.bigchaindb_api_url }}')
 ```
 
 ```java
 BigchainDbConfigBuilder
-	.baseUrl("https://test.bigchaindb.com/")
-	.addToken("app_id", "Get one from testnet.bigchaindb.com")
-	.addToken("app_key","Get one from testnet.bigchaindb.com").setup();
+	.baseUrl("{{ site.bigchaindb_api_url }}/").setup();
 ```
diff --git a/_src/_guide/tutorial-car-telemetry-app.md b/_src/_guide/tutorial-car-telemetry-app.md
index fe8d8ae..87fcd50 100644
--- a/_src/_guide/tutorial-car-telemetry-app.md
+++ b/_src/_guide/tutorial-car-telemetry-app.md
@@ -72,12 +72,7 @@ const Orm = require('bigchaindb-orm')
 
 class DID extends Orm {
     constructor(entity) {
-        super(
-            API_PATH, {
-                app_id: 'Get one from testnet.bigchaindb.com',
-                app_key: 'Get one from testnet.bigchaindb.com'
-            }
-        )
+        super(API_PATH)
         this.entity = entity
     }
 }
diff --git a/_src/developers/getstarted.html b/_src/developers/getstarted.html
index 0ce482c..1516f81 100644
--- a/_src/developers/getstarted.html
+++ b/_src/developers/getstarted.html
@@ -86,10 +86,7 @@ redirect_from:
 from bigchaindb_driver import BigchainDB
 from bigchaindb_driver.crypto import generate_keypair
 
-bdb = BigchainDB(
-    '{{ site.bigchaindb_api_url }}',
-    headers={'app_id': 'Get credentials from testnet.bigchaindb.com',
-             'app_key': 'by signing up and going to your Applications screen'})
+bdb = BigchainDB('{{ site.bigchaindb_api_url }}')
 alice = generate_keypair()
 tx = bdb.transactions.prepare(
     operation='CREATE',
@@ -109,10 +106,7 @@ bdb.transactions.send(signed_tx)
 const driver = require('bigchaindb-driver')
 
 const alice = new driver.Ed25519Keypair()
-const conn = new driver.Connection(
-    '{{ site.bigchaindb_api_url }}/api/v1/',
-    { app_id: 'Get credentials from testnet.bigchaindb.com',
-      app_key: 'by signing up and going to your Applications screen' })
+const conn = new driver.Connection('{{ site.bigchaindb_api_url }}/api/v1/')
 const tx = driver.Transaction.makeCreateTransaction(
     { message: 'Blockchain all the things!' },
     null,