diff --git a/src/database.js b/src/database.js
index f8f2be083..c033bf9dc 100644
--- a/src/database.js
+++ b/src/database.js
@@ -104,8 +104,6 @@ function clear(callback) {
     async.series([
         child_process.exec.bind(null, cmd),
         require('./clientdb.js')._addDefaultClients,
-        require('./domaindb.js')._addDefaultDomain,
-        require('./maildb.js')._addDefaultDomain,
         require('./groupdb.js')._addDefaultGroups
     ], callback);
 }
diff --git a/src/domaindb.js b/src/domaindb.js
index fd93359e5..1bc52a4aa 100644
--- a/src/domaindb.js
+++ b/src/domaindb.js
@@ -9,14 +9,12 @@ exports = module.exports = {
     update: update,
     del: del,
 
-    _clear: clear,
-    _addDefaultDomain: addDefaultDomain
+    _clear: clear
 };
 
 var assert = require('assert'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror'),
-    config = require('./config.js'),
     safe = require('safetydance');
 
 var DOMAINS_FIELDS = [ 'domain', 'zoneName', 'provider', 'configJson' ].join(',');
@@ -113,12 +111,3 @@ function clear(callback) {
         callback(error);
     });
 }
-
-function addDefaultDomain(callback) {
-    assert(config.fqdn(), 'no fqdn set in config, cannot continue');
-
-    add(config.fqdn(), { zoneName: config.zoneName(), provider: 'manual', config: { } }, function (error) {
-        if (error && error.reason !== DatabaseError.ALREADY_EXISTS) return callback(error);
-        callback();
-    });
-}
diff --git a/src/maildb.js b/src/maildb.js
index a78237e67..2b7685a6d 100644
--- a/src/maildb.js
+++ b/src/maildb.js
@@ -8,7 +8,6 @@ exports = module.exports = {
     update: update,
 
     _clear: clear,
-    _addDefaultDomain: addDefaultDomain,
 
     TYPE_USER: 'user',
     TYPE_APP: 'app',
@@ -16,7 +15,6 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    config = require('./config.js'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror.js'),
     safe = require('safetydance');
@@ -122,12 +120,3 @@ function update(domain, data, callback) {
         callback(null);
     });
 }
-
-function addDefaultDomain(callback) {
-    assert(config.fqdn(), 'no fqdn set in config, cannot continue');
-
-    add(config.fqdn(), function (error) {
-        if (error && error.reason !== DatabaseError.ALREADY_EXISTS) return callback(error);
-        callback();
-    });
-}