diff --git a/installer/src/server.js b/installer/src/server.js
index afec2fd8f..da2eee5ed 100755
--- a/installer/src/server.js
+++ b/installer/src/server.js
@@ -7,7 +7,6 @@
 var assert = require('assert'),
     async = require('async'),
     debug = require('debug')('installer:server'),
-    dns = require('dns'),
     express = require('express'),
     fs = require('fs'),
     http = require('http'),
@@ -17,7 +16,6 @@ var assert = require('assert'),
     json = require('body-parser').json,
     lastMile = require('connect-lastmile'),
     morgan = require('morgan'),
-    path = require('path'),
     safe = require('safetydance');
 
 exports = module.exports = {
@@ -31,7 +29,6 @@ var CLOUDRON_CONFIG_FILE = '/home/yellowtent/configs/cloudron.conf';
 var BOX_VERSIONS_URL = 'https://s3.amazonaws.com/prod-cloudron-releases/versions.json';
 
 var gHttpServer = null; // update server; used for updates
-var gSetupServer = null; // setup server; only used for initial setup
 
 function provision(callback) {
     if (fs.existsSync(CLOUDRON_CONFIG_FILE)) {
@@ -43,9 +40,6 @@ function provision(callback) {
 
     function retry(error) {
         if (error) console.error(error);
-
-        if (!gSetupServer) startSetupServer(function () { debug('Setup Server started.'); });
-
         setTimeout(provision.bind(null, callback), 5000);
     }
 
@@ -72,8 +66,6 @@ function provision(callback) {
 
     if (typeof userData.data.boxVersionsUrl !== 'string') return retry('boxVersionsUrl in user data has to be a non-empty string');
 
-    stopSetupServer(function () { debug('Setup Server stopped.'); });
-
     installer.provision(userData, callback);
 }
 
@@ -126,83 +118,6 @@ function stopUpdateServer(callback) {
     gHttpServer = null;
 }
 
-function setup(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-
-    if (!req.body.fqdn || typeof req.body.fqdn !== 'string') return next(new HttpError(400, 'No fqdn provided'));
-
-    debug('setup: %j', req.body);
-
-    var data = {
-        fqdn: req.body.fqdn
-    };
-
-    if (req.body.boxVersionsUrl && typeof req.body.boxVersionsUrl === 'string') data.boxVersionsUrl = req.body.boxVersionsUrl;
-
-    fs.writeFile(PROVISION_CONFIG_FILE_JSON, JSON.stringify({ data: data }), function (error) {
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(201, {}));
-    });
-}
-
-function dnsReady(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-
-    if (!req.body.fqdn || typeof req.body.fqdn !== 'string') return next(new HttpError(400, 'No fqdn provided'));
-    if (!req.body.ip || typeof req.body.ip !== 'string') return next(new HttpError(400, 'No ip provided'));
-
-    debug('dnsReady: %j', req.body);
-
-    dns.resolve4('my.' + req.body.fqdn, function (error, result) {
-        if (error) return next(new HttpError(409, 'Not yet ready'));
-
-        var sync = result.some(function (a) {
-            return a === req.body.ip;
-        });
-
-        if (!sync) return next(new HttpError(409, 'Not yet ready'));
-
-        next(new HttpError(200, {}));
-    });
-}
-
-function startSetupServer(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('Starting setup server');
-
-    var app = express();
-
-    var router = new express.Router();
-
-    if (process.env.NODE_ENV !== 'test') app.use(morgan('dev', { immediate: false }));
-
-    app.use(express.static(path.join(__dirname, '../www/')))
-       .use(json({ strict: true }))
-       .use(router)
-       .use(lastMile());
-
-    router.post('/api/v1/dns', dnsReady);
-    router.post('/api/v1/setup', setup);
-
-    gSetupServer = http.createServer(app);
-    gSetupServer.on('error', console.error);
-
-    gSetupServer.listen(process.env.SETUP_PORT || 80, '0.0.0.0', callback);
-}
-
-function stopSetupServer(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('Stopping setup server');
-
-    if (!gSetupServer) return callback(null);
-
-    gSetupServer.close(callback);
-    gSetupServer = null;
-}
-
 function start(callback) {
     assert.strictEqual(typeof callback, 'function');
 
diff --git a/installer/www/index.html b/installer/www/index.html
deleted file mode 100644
index 2698878d9..000000000
--- a/installer/www/index.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<html>
-<head>
-    <title> Cloudron Setup </title>
-
-    <!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-
-    <!-- Optional theme -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
-
-    <!-- jQuery 3 minified -->
-    <script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
-
-    <!-- Latest compiled and minified JavaScript -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-
-    <!-- fontawesome -->
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
-
-</head>
-
-<body>
-
-<div class="container">
-    <div class="row">
-        <div class="col-md-offset-2 col-md-8">
-            <h1>Cloudron Setup</h1>
-
-
-            <div id="setupForm">
-                <form>
-                    <div class="form-group">
-                        <label for="inputDomain">Domain</label>
-                        <input type="text" class="form-control" id="inputDomain" name="fqdn" placeholder="example.com" required>
-                    </div>
-                    <a data-toggle="collapse" href="#collapseExample">Advanced</a><br/>
-                    <div class="collapse" id="collapseExample">
-                        <div class="form-group">
-                            <label for="inputVersionsUrl">Versions URL (optional)</label>
-                            <input type="text" class="form-control" id="inputVersionsUrl" name="boxVersionsUrl" placeholder="">
-                        </div>
-                    </div>
-                    <button type="submit" class="btn btn-default pull-right">Next</button>
-                </form>
-            </div>
-            <div id="waitForDNS" style="display: none;">
-                <center>
-                    <br/>
-                    <h4>Now setup a wildcard or at least a <b>my.<span id="fqdn_placeholder"></span></b> DNS record, pointing to <b><span id="ip_placeholder"></span></b></h4>
-                    <br/>
-                    <i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw"></i><br/>
-                    <br/>
-                    <i>Waiting for DNS to be setup</i>
-                    <br/><br/>
-                    <button type="button" class="btn btn-default" id="backButton">Back</button>
-                </center>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-
-$(function () {
-    'use strict';
-
-    $('#backButton').on('click', function () {
-        showForm();
-    });
-
-    function hideForm() {
-        $('#setupForm').hide();
-        $('#waitForDNS').show();
-    }
-
-    function showForm() {
-        $('#waitForDNS').hide();
-        $('#setupForm').show();
-    }
-
-    function setup() {
-        var data = {
-            fqdn: $('#inputDomain').val(),
-            boxVersionsUrl: $('#inputVersionsUrl').val()
-        };
-
-        $.ajax({
-            type: 'POST',
-            url: '/api/v1/setup',
-            data: JSON.stringify(data),
-            success: function (data) { console.log('data: ' + data); },
-            contentType: 'application/json'
-        });
-    }
-
-    function waitForDNS(fqdn, ip) {
-        $('#fqdn_placeholder').text(fqdn);
-        $('#ip_placeholder').text(ip);
-
-        hideForm();
-
-        var data = {
-            fqdn: fqdn,
-            ip: ip
-        };
-
-        $.ajax({
-            type: 'POST',
-            url: '/api/v1/dns',
-            data: JSON.stringify(data),
-            contentType: 'application/json',
-            success: function (data, status) { console.log('data: ', status, data); },
-            error: function () {
-                setTimeout(waitForDNS.bind(null, fqdn, ip), 5000);
-            },
-        });
-    }
-
-    $('#setupForm').submit(function( event ) {
-        event.preventDefault();
-
-        waitForDNS($('#inputDomain').val(), location.hostname);
-    });
-});
-
-</script>
-
-</body>
-
-</html>