diff --git a/docs/source/server-reference/bigchaindb-cli.md b/docs/source/server-reference/bigchaindb-cli.md
index 3e11446a..57d119f4 100644
--- a/docs/source/server-reference/bigchaindb-cli.md
+++ b/docs/source/server-reference/bigchaindb-cli.md
@@ -1,9 +1,6 @@
-# BigchainDB Command Line Interface (CLI)
+# Command Line Interface (CLI)
 
-**Note: At the time of writing, BigchainDB Server and our BigchainDB client are combined, so the BigchainDB CLI includes some server-specific commands and some client-specific commands (e.g. `bigchaindb load`). Soon, BigchainDB Server will be separate from all BigchainDB clients, and they'll all have different CLIs.**
-
-
-The command-line command to interact with BigchainDB is `bigchaindb`.
+The command-line command to interact with BigchainDB Server is `bigchaindb`.
 
 
 ## bigchaindb \-\-help
diff --git a/docs/source/server-reference/configuration.md b/docs/source/server-reference/configuration.md
index cce5b6b8..41b0c2ca 100644
--- a/docs/source/server-reference/configuration.md
+++ b/docs/source/server-reference/configuration.md
@@ -1,8 +1,6 @@
-# BigchainDB Configuration Settings
+# Configuration Settings
 
-**Note: At the time of writing, BigchainDB Server code and BigchainDB Python driver code are mixed together, so the following settings are the settings used by BigchainDB Server and also by clients written using the Python driver code. Soon, the code will be separated into server, driver and shared modules, so that BigchainDB Server and BigchainDB clients will have different configuration settings.**
-
-The value of each configuration setting is determined according to the following rules:
+The value of each BigchainDB Server configuration setting is determined according to the following rules:
 
 * If it's set by an environment variable, then use that value
 * Otherwise, if it's set in a local config file, then use that value