diff --git a/etc/marconi-proxy.conf-sample b/etc/marconi-proxy.conf-sample
deleted file mode 100644
index 03929797c..000000000
--- a/etc/marconi-proxy.conf-sample
+++ /dev/null
@@ -1,43 +0,0 @@
-# By default, this should line in one of:
-# ~/.marconi/marconi-proxy.conf
-# /etc/marconi/marconi-proxy.conf
-
-[DEFAULT]
-# Show more verbose log output (sets INFO log level output)
-;verbose = False
-
-# Show debugging output in logs (sets DEBUG log level output)
-;debug = False
-
-# Log to this file!
-log_file = /var/log/marconi/proxy.log
-
-;auth_strategy =
-
-# ================= Syslog Options ============================
-
-# Send logs to syslog (/dev/log) instead of to file specified
-# by `log_file`
-;use_syslog = False
-
-# Facility to use. If unset defaults to LOG_USER.
-;syslog_log_facility = LOG_LOCAL0
-
-
-# Transport driver module (e.g., wsgi, zmq)
-# Storage driver module (e.g., mongodb, sqlite)
-[drivers]
-transport = wsgi
-storage = mongodb
-
-[drivers:transport:wsgi]
-;bind = 0.0.0.0
-;port = 8889
-
-[drivers:storage:mongodb]
-uri = mongodb://db1.example.net,db2.example.net:2500/?replicaSet=test&ssl=true&w=majority
-database = marconi_proxy
-
-[oslo_cache]
-;cache_backend = memcached
-;cache_prefix = my_namespace
diff --git a/marconi/common/transport/version.py b/marconi/common/transport/version.py
index be382b678..ed4509820 100644
--- a/marconi/common/transport/version.py
+++ b/marconi/common/transport/version.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""version: version information for the proxy transport API."""
+"""version: version information for the transport API."""
 
 
 def info():
diff --git a/tests/etc/wsgi_proxy_memory.conf b/tests/etc/wsgi_proxy_memory.conf
deleted file mode 100644
index d38199d4a..000000000
--- a/tests/etc/wsgi_proxy_memory.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[DEFAULT]
-debug = False
-verbose = False
-
-[drivers]
-transport = wsgi
-storage = memory
-
-[drivers:transport:wsgi]
-port = 8888
diff --git a/tests/etc/wsgi_proxy_mongodb.conf b/tests/etc/wsgi_proxy_mongodb.conf
deleted file mode 100644
index 877eeda91..000000000
--- a/tests/etc/wsgi_proxy_mongodb.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[DEFAULT]
-debug = False
-verbose = False
-
-[drivers]
-transport = wsgi
-storage = mongodb
-
-[drivers:transport:wsgi]
-port = 8888
-
-[drivers:storage:mongodb]
-uri = mongodb://127.0.0.1:27017
-database = marconi_proxy_test