diff --git a/README.rst b/README.rst
index f0daa61..85067c0 100644
--- a/README.rst
+++ b/README.rst
@@ -7,8 +7,6 @@ flavors by `Runscope <https://www.runscope.com/>`__
 
 |Build Status|
 
-|Deploy to Heroku|
-
 ENDPOINTS
 ---------
 
@@ -157,7 +155,6 @@ $ curl https://httpbin.org/get?show\_env=1
         "Accept-Encoding": "gzip,deflate,sdch",
         "X-Forwarded-Port": "443",
         "X-Forwarded-For": "109.60.101.240",
-        "X-Heroku-Dynos-In-Use": "1",
         "Host": "httpbin.org",
         "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
         "User-Agent": "Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.83 Safari/535.11",
@@ -166,8 +163,6 @@ $ curl https://httpbin.org/get?show\_env=1
         "Connection": "keep-alive",
         "X-Forwarded-Proto": "https",
         "Cookie": "_gauges_unique_day=1; _gauges_unique_month=1; _gauges_unique_year=1; _gauges_unique=1; _gauges_unique_hour=1",
-        "X-Heroku-Queue-Depth": "0",
-        "X-Heroku-Queue-Wait-Time": "11",
         "Content-Type": ""
       },
       "args": {
@@ -213,9 +208,9 @@ Originally created by `Kenneth Reitz <http://kennethreitz.com/>`__.
 SEE ALSO
 --------
 
-https://hurl.it http://requestb.in http://python-requests.org
+- https://hurl.it
+- http://requestb.in
+- http://python-requests.org
 
 .. |Build Status| image:: https://travis-ci.org/Runscope/httpbin.svg
    :target: https://travis-ci.org/Runscope/httpbin
-.. |Deploy to Heroku| image:: https://camo.githubusercontent.com/c0824806f5221ebb7d25e559568582dd39dd1170/68747470733a2f2f7777772e6865726f6b7563646e2e636f6d2f6465706c6f792f627574746f6e2e706e67
-   :target: https://heroku.com/deploy?template=https://github.com/Runscope/httpbin
diff --git a/httpbin/templates/httpbin.1.html b/httpbin/templates/httpbin.1.html
index 2a430a5..da55af1 100644
--- a/httpbin/templates/httpbin.1.html
+++ b/httpbin/templates/httpbin.1.html
@@ -2,8 +2,6 @@
 <h1>httpbin(1): HTTP Request &amp; Response Service</h1>
 <p>Freely hosted in <a href="http://httpbin.org">HTTP</a>, <a href="https://httpbin.org">HTTPS</a> &amp; <a href="http://eu.httpbin.org/">EU</a> flavors by <a href="https://www.runscope.com/">Runscope</a></p>
 
-<p><a href="https://heroku.com/deploy?template=https://github.com/Runscope/httpbin"><img src="https://camo.githubusercontent.com/c0824806f5221ebb7d25e559568582dd39dd1170/68747470733a2f2f7777772e6865726f6b7563646e2e636f6d2f6465706c6f792f627574746f6e2e706e67" alt="Deploy to Heroku" /></a></p>
-
 <h2 id="ENDPOINTS">ENDPOINTS</h2>
 
 <ul>
@@ -105,7 +103,6 @@ Content-Length: 135
     "Accept-Encoding": "gzip,deflate,sdch",
     "X-Forwarded-Port": "443",
     "X-Forwarded-For": "109.60.101.240",
-    "X-Heroku-Dynos-In-Use": "1",
     "Host": "httpbin.org",
     "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
     "User-Agent": "Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.83 Safari/535.11",
@@ -114,8 +111,6 @@ Content-Length: 135
     "Connection": "keep-alive",
     "X-Forwarded-Proto": "https",
     "Cookie": "_gauges_unique_day=1; _gauges_unique_month=1; _gauges_unique_year=1; _gauges_unique=1; _gauges_unique_hour=1",
-    "X-Heroku-Queue-Depth": "0",
-    "X-Heroku-Queue-Wait-Time": "11",
     "Content-Type": ""
   },
   "args": {
diff --git a/requirements.txt b/requirements.txt
index af6bb50..a69953b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,6 @@ decorator==3.4.0
 Flask==0.10.1
 gevent==1.0.1
 greenlet==0.4.2
-gunicorn==18.0
 itsdangerous==0.24
 Jinja2==2.7.2
 MarkupSafe==0.23