diff --git a/config/dev/generalnodea.conf b/config/dev/generalnodea.conf
index 7547300ca6..efe2e546c2 100644
--- a/config/dev/generalnodea.conf
+++ b/config/dev/generalnodea.conf
@@ -3,4 +3,3 @@ keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"
 p2pAddress : "localhost:10002"
 rpcAddress : "localhost:10003"
-webAddress : "localhost:10004"
diff --git a/config/dev/generalnodeb.conf b/config/dev/generalnodeb.conf
index f922e91536..c1eb95ba71 100644
--- a/config/dev/generalnodeb.conf
+++ b/config/dev/generalnodeb.conf
@@ -3,4 +3,3 @@ keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"
 p2pAddress : "localhost:10005"
 rpcAddress : "localhost:10006"
-webAddress : "localhost:10007"
diff --git a/config/dev/nameservernode.conf b/config/dev/nameservernode.conf
index 3f700628dc..0b6210a22d 100644
--- a/config/dev/nameservernode.conf
+++ b/config/dev/nameservernode.conf
@@ -2,7 +2,6 @@ myLegalName : "O=Notary Service,OU=corda,L=London,C=GB"
 keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"
 p2pAddress : "localhost:10000"
-webAddress : "localhost:10001"
 notary : {
     validating : true
 }
diff --git a/docs/source/deploying-a-node.rst b/docs/source/deploying-a-node.rst
index ed3e6d7816..7071466df8 100644
--- a/docs/source/deploying-a-node.rst
+++ b/docs/source/deploying-a-node.rst
@@ -38,7 +38,6 @@ handling, and ensures the Corda service is run at boot.
       basedir : "/opt/corda"
       p2pAddress : "example.com:10002"
       rpcAddress : "example.com:10003"
-      webAddress : "0.0.0.0:10004"
       h2port : 11000
       emailAddress : "you@example.com"
       myLegalName : "O=Bank of Breakfast Tea, L=London, C=GB"
@@ -203,7 +202,6 @@ at boot, and means the Corda service stays running with no users connected to th
         basedir : "C:\\Corda"
         p2pAddress : "example.com:10002"
         rpcAddress : "example.com:10003"
-        webAddress : "0.0.0.0:10004"
         h2port : 11000
         emailAddress: "you@example.com"
         myLegalName : "O=Bank of Breakfast Tea, L=London, C=GB"
diff --git a/docs/source/setting-up-a-corda-network.rst b/docs/source/setting-up-a-corda-network.rst
index b8946a2841..7b329272ea 100644
--- a/docs/source/setting-up-a-corda-network.rst
+++ b/docs/source/setting-up-a-corda-network.rst
@@ -42,8 +42,6 @@ The most important fields regarding network configuration are:
   is the hostname *that must be externally resolvable by other nodes in the network*. In the above configuration this is the
   resolvable name of a machine in a VPN.
 * ``rpcAddress``: The address to which Artemis will bind for RPC calls.
-* ``webAddress``: The address the webserver should bind. Note that the port must be distinct from that of ``p2pAddress``
-  and ``rpcAddress`` if they are on the same machine.
 * ``notary.serviceLegalName``: The name of the notary service, required to setup distributed notaries with the network-bootstrapper.
 
 Starting the nodes
@@ -55,8 +53,6 @@ be found in :doc:`network-bootstrapper`.
 Once that's done you may now start the nodes in any order. You should see a banner, some log lines and eventually
 ``Node started up and registered``, indicating that the node is fully started.
 
-.. TODO: Add a better way of polling for startup. A programmatic way of determining whether a node is up is to check whether it's ``webAddress`` is bound.
-
 In terms of process management there is no prescribed method. You may start the jars by hand or perhaps use systemd and friends.
 
 Logging