diff --git a/ugly_hacks/santiago/protocols/https/controller.py b/ugly_hacks/santiago/protocols/https/controller.py
index b94bf16de..79ed556a6 100644
--- a/ugly_hacks/santiago/protocols/https/controller.py
+++ b/ugly_hacks/santiago/protocols/https/controller.py
@@ -49,7 +49,7 @@ class Listener(SantiagoListener):
 
     def stop(self):
         """Shuts down the listener."""
-        pass
+        cherrypy.engine.stop()
 
     @cherrypy.expose
     def index(self, **kwargs):
diff --git a/ugly_hacks/santiago/santiago.py b/ugly_hacks/santiago/santiago.py
index 95bc4a59d..50759eee0 100644
--- a/ugly_hacks/santiago/santiago.py
+++ b/ugly_hacks/santiago/santiago.py
@@ -177,13 +177,6 @@ class Santiago(object):
         When this has finished, the Santiago will be ready to go.
 
         """
-        debug_log("Setting up protocols.")
-
-        find_protocol = (lambda protocol: sys.modules[
-                self.__class__.CONTROLLER_MODULE.format(protocol)])
-
-        [find_protocol(protocol).setup(None) for protocol in self.protocols]
-
         debug_log("Starting connectors.")
 
         for connector in (list(self.listeners.itervalues()) +
@@ -195,10 +188,6 @@ class Santiago(object):
         # for monitor in list(self.monitors.itervalues()):
         #     monitor.start()
 
-        debug_log("Starting protocols.")
-
-        [find_protocol(protocol).start() for protocol in self.protocols]
-
         debug_log("Santiago started!")
 
         count = 0