diff --git a/arangod/HttpServer/ApplicationEndpointServer.cpp b/arangod/HttpServer/ApplicationEndpointServer.cpp
index 47f00dc460..688a4954e6 100644
--- a/arangod/HttpServer/ApplicationEndpointServer.cpp
+++ b/arangod/HttpServer/ApplicationEndpointServer.cpp
@@ -393,27 +393,6 @@ bool ApplicationEndpointServer::prepare () {
 /// {@inheritDoc}
 ////////////////////////////////////////////////////////////////////////////////
 
-bool ApplicationEndpointServer::prepare2 () {
-  if (_disabled) {
-    return true;
-  }
-
-  // scheduler might be created after prepare(), so we need to use prepare2()!!
-  Scheduler* scheduler = _applicationScheduler->scheduler();
-
-  if (scheduler == nullptr) {
-    LOG_FATAL_AND_EXIT("no scheduler is known, cannot create server");
-
-    return false;
-  }
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-/// {@inheritDoc}
-////////////////////////////////////////////////////////////////////////////////
-
 bool ApplicationEndpointServer::open () {
   if (_disabled) {
     return true;
diff --git a/arangod/HttpServer/ApplicationEndpointServer.h b/arangod/HttpServer/ApplicationEndpointServer.h
index 1151210638..b2cc8392ff 100644
--- a/arangod/HttpServer/ApplicationEndpointServer.h
+++ b/arangod/HttpServer/ApplicationEndpointServer.h
@@ -155,12 +155,6 @@ namespace triagens {
 
         bool prepare ();
 
-////////////////////////////////////////////////////////////////////////////////
-/// {@inheritDoc}
-////////////////////////////////////////////////////////////////////////////////
-
-        bool prepare2 ();
-
 ////////////////////////////////////////////////////////////////////////////////
 /// {@inheritDoc}
 ////////////////////////////////////////////////////////////////////////////////