diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py
index 4d2e003f75..a81479f52a 100644
--- a/resources/default_tweaks.py
+++ b/resources/default_tweaks.py
@@ -350,9 +350,6 @@ sony_collection_sorting_rules = []
 # a book' are added when copying books to another library
 add_new_book_tags_when_importing_books = False
 
-#: Set the maximum number of tags to show per book in the Content server
-max_content_server_tags_shown=5
-
 #: Set custom metadata fields that the Content server will or will not display.
 # content_server_will_display is a list of custom fields to be displayed.
 # content_server_wont_display is a list of custom fields not to be displayed.
@@ -457,14 +454,6 @@ maximum_cover_size = (1650, 2200)
 # the files will be sent to the location with the most free space.
 send_news_to_device_location = "main"
 
-#: What interfaces should the Content server listen on
-# By default, the calibre Content server listens on '0.0.0.0' which means that it
-# accepts IPv4 connections on all interfaces. You can change this to, for
-# example, '127.0.0.1' to only listen for connections from the local machine, or
-# to '::' to listen to all incoming IPv6 and IPv4 connections (this may not
-# work on all operating systems)
-server_listen_on = '0.0.0.0'
-
 #: Unified toolbar on OS X
 # If you enable this option and restart calibre, the toolbar will be 'unified'
 # with the titlebar as is normal for OS X applications. However, doing this has
diff --git a/src/calibre/srv/TODO b/src/calibre/srv/TODO
index 649d7d3644..d8899dddce 100644
--- a/src/calibre/srv/TODO
+++ b/src/calibre/srv/TODO
@@ -1,5 +1,3 @@
-Remove all *content_server_* and server_listen_on tweaks 
-
 Rewrite server integration with nginx/apache section
 
 Remove dependency on cherrypy from download and contribs pages and remove