diff --git a/tornado/s3server.py b/demos/s3server/s3server.py
similarity index 100%
rename from tornado/s3server.py
rename to demos/s3server/s3server.py
diff --git a/tornado/test/import_test.py b/tornado/test/import_test.py
index b6601326..3b6d3f79 100644
--- a/tornado/test/import_test.py
+++ b/tornado/test/import_test.py
@@ -17,7 +17,6 @@ class ImportTest(unittest.TestCase):
         import tornado.iostream
         import tornado.locale
         import tornado.options
-        import tornado.s3server
         import tornado.simple_httpclient
         import tornado.stack_context
         import tornado.template
diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt
index bc9c85ff..6470adc1 100644
--- a/website/templates/documentation.txt
+++ b/website/templates/documentation.txt
@@ -92,9 +92,6 @@ walkthrough of the `web` package.
   * [`iostream`](http://github.com/facebook/tornado/blob/master/tornado/iostream.py) - A simple wrapper around non-blocking sockets to aide common reading and writing patterns
   * [`ioloop`](http://github.com/facebook/tornado/blob/master/tornado/ioloop.py) - Core I/O loop
 
-### Random modules
-  * [`s3server`](http://github.com/facebook/tornado/blob/master/tornado/s3server.py) - A web server that implements most of the [Amazon S3](http://aws.amazon.com/s3/) interface, backed by local file storage
-
 
 Tornado walkthrough
 -------------------