diff --git a/arangod/Aql/Executor.cpp b/arangod/Aql/Executor.cpp
index 3322ea49e6..c6de3c7fce 100644
--- a/arangod/Aql/Executor.cpp
+++ b/arangod/Aql/Executor.cpp
@@ -250,7 +250,6 @@ std::unordered_map<std::string, Function const> const Executor::FunctionNames{
   { "FIRST_LIST",                  Function("FIRST_LIST",                  "AQL_FIRST_LIST", ".|+", true, false, true, true) },
   { "FIRST_DOCUMENT",              Function("FIRST_DOCUMENT",              "AQL_FIRST_DOCUMENT", ".|+", true, false, true, true) },
   { "PARSE_IDENTIFIER",            Function("PARSE_IDENTIFIER",            "AQL_PARSE_IDENTIFIER", ".", true, false, true, true) },
-  { "SKIPLIST",                    Function("SKIPLIST",                    "AQL_SKIPLIST", "h,a|n,n", false, true, false, true) },
   { "CURRENT_USER",                Function("CURRENT_USER",                "AQL_CURRENT_USER", "", false, false, false, true) },
   { "CURRENT_DATABASE",            Function("CURRENT_DATABASE",            "AQL_CURRENT_DATABASE", "", false, false, false, true) }
 };
diff --git a/js/server/modules/org/arangodb/aql.js b/js/server/modules/org/arangodb/aql.js
index 6779db5f4b..195ec67431 100644
--- a/js/server/modules/org/arangodb/aql.js
+++ b/js/server/modules/org/arangodb/aql.js
@@ -3950,56 +3950,6 @@ function AQL_PARSE_IDENTIFIER (value) {
   return null;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief query a skiplist index
-///
-/// returns a documents from a skiplist index on the specified collection. Only
-/// documents that match the specified condition will be returned.
-////////////////////////////////////////////////////////////////////////////////
-
-function AQL_SKIPLIST (collection, condition, skip, limit) {
-  'use strict';
-
-  var keys = [ ], key, idx;
-
-  for (key in condition) {
-    if (condition.hasOwnProperty(key)) {
-      keys.push(key);
-    }
-  }
-
-  var c = COLLECTION(collection);
-
-  if (c === null) {
-    THROW("SKIPLIST", INTERNAL.errors.ERROR_ARANGO_COLLECTION_NOT_FOUND, collection);
-  }
-
-  idx = c.lookupSkiplist.apply(c, keys);
-
-  if (idx === null) {
-    THROW("SKIPLIST", INTERNAL.errors.ERROR_ARANGO_NO_INDEX);
-  }
-
-  if (skip === undefined || skip === null) {
-    skip = 0;
-  }
-
-  if (limit === undefined || limit === null) {
-    limit = null;
-  }
-
-  try {
-    if (isCoordinator) {
-      return c.byConditionSkiplist(idx.id, condition).skip(skip).limit(limit).toArray();
-    }
-
-    return c.BY_CONDITION_SKIPLIST(idx.id, condition, skip, limit).documents;
-  }
-  catch (err) {
-    THROW("SKIPLIST", INTERNAL.errors.ERROR_ARANGO_NO_INDEX);
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief check whether a document has a specific attribute
 ////////////////////////////////////////////////////////////////////////////////
@@ -8526,7 +8476,6 @@ exports.AQL_NOT_NULL = AQL_NOT_NULL;
 exports.AQL_FIRST_LIST = AQL_FIRST_LIST;
 exports.AQL_FIRST_DOCUMENT = AQL_FIRST_DOCUMENT;
 exports.AQL_PARSE_IDENTIFIER = AQL_PARSE_IDENTIFIER;
-exports.AQL_SKIPLIST = AQL_SKIPLIST;
 exports.AQL_HAS = AQL_HAS;
 exports.AQL_ATTRIBUTES = AQL_ATTRIBUTES;
 exports.AQL_VALUES = AQL_VALUES;