diff --git a/src/mailboxdb.js b/src/mailboxdb.js
index a6f992c16..ef4674eef 100644
--- a/src/mailboxdb.js
+++ b/src/mailboxdb.js
@@ -5,7 +5,6 @@ exports = module.exports = {
     del: del,
     upsertByOwner: upsertByOwner,
     get: get,
-    getAll: getAll,
     getAliases: getAliases,
     setAliases: setAliases,
     getByOwnerId: getByOwnerId,
@@ -124,24 +123,6 @@ function getByOwnerId(ownerId, callback) {
     });
 }
 
-function getAll(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    var query = 'SELECT m1.name, m1.creationTime, GROUP_CONCAT(m2.name) AS aliases ' +
-                'FROM mailboxes as m1 ' +
-                'LEFT OUTER JOIN mailboxes as m2 ON m1.name = m2.aliasTarget ' +
-                'WHERE m1.aliasTarget IS NULL ' +
-                'GROUP BY m1.name';
-
-    database.query(query, function (error, results) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-
-        results.forEach(postProcess);
-
-        callback(null, results);
-    });
-}
-
 function setAliases(name, aliases, ownerId, ownerType, callback) {
     assert.strictEqual(typeof name, 'string');
     assert(util.isArray(aliases));
diff --git a/src/test/database-test.js b/src/test/database-test.js
index d66e932d9..e78a67606 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -1204,18 +1204,7 @@ describe('database', function () {
             });
         });
 
-        it('getAll succeeds', function (done) {
-            mailboxdb.getAll(function (error, results) {
-                expect(error).to.be(null);
-                expect(results).to.be.an(Array);
-                expect(results.length).to.be(1);
-                expect(results[0].name).to.be('support');
-
-                done();
-            });
-        });
-
-        it('can set alias', function (done) {
+       it('can set alias', function (done) {
             mailboxdb.setAliases('support', [ 'support2', 'help' ], 'support', 'user', function (error) {
                 expect(error).to.be(null);
                 done();