diff --git a/migrations/20191029223928-settings-default-sysinfo.js b/migrations/20191029223928-settings-default-sysinfo.js
index a47b67b64..325a4e56e 100644
--- a/migrations/20191029223928-settings-default-sysinfo.js
+++ b/migrations/20191029223928-settings-default-sysinfo.js
@@ -3,21 +3,7 @@
 var fs = require('fs');
 
 exports.up = function(db, callback) {
-    if (!fs.existsSync('/etc/cloudron/PROVIDER')) {
-        console.log('Unable to locate PROVIDER');
-        return callback();
-    }
-
-    const provider = fs.readFileSync('/etc/cloudron/PROVIDER', 'utf8');
-    let sysinfoConfig;
-
-    if (provider === 'ec2' || provider === 'lightsail' || provider === 'ami') {
-        sysinfoConfig = { provider: 'ec2' };
-    } else if (provider === 'scaleway') {
-        sysinfoConfig = { provider: 'scaleway' };
-    } else {
-        sysinfoConfig = { provider: 'generic' };
-    }
+    let sysinfoConfig = { provider: 'generic' };
 
     db.runSql('REPLACE INTO settings (name, value) VALUES(?, ?)', [ 'sysinfo_config', JSON.stringify(sysinfoConfig) ], callback);
 };
diff --git a/src/sysinfo.js b/src/sysinfo.js
index feca589aa..a1c2ebe35 100644
--- a/src/sysinfo.js
+++ b/src/sysinfo.js
@@ -15,12 +15,6 @@ function api(provider) {
     assert.strictEqual(typeof provider, 'string');
 
     switch (provider) {
-    case 'ec2':
-    case 'lightsail':
-    case 'ami':
-        return require('./sysinfo/ec2.js');
-
-    case 'scaleway': return require('./sysinfo/scaleway.js');
     case 'fixed': return require('./sysinfo/fixed.js');
     case 'network-interface': return require('./sysinfo/network-interface.js');
     default: return require('./sysinfo/generic.js');
diff --git a/src/sysinfo/ec2.js b/src/sysinfo/ec2.js
deleted file mode 100644
index 6a5c92e4f..000000000
--- a/src/sysinfo/ec2.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    getServerIp: getServerIp,
-    testConfig: testConfig
-};
-
-var assert = require('assert'),
-    BoxError = require('../boxerror.js'),
-    superagent = require('superagent'),
-    util = require('util');
-
-function getServerIp(config, callback) {
-    assert.strictEqual(typeof config, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    superagent.get('http://169.254.169.254/latest/meta-data/public-ipv4').timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) return callback(new BoxError(BoxError.NETWORK_ERROR, error));
-        if (result.statusCode !== 200) return callback(new BoxError(BoxError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body)));
-
-        callback(null, result.text);
-    });
-}
-
-function testConfig(config, callback) {
-    assert.strictEqual(typeof config, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    callback(null);
-}
diff --git a/src/sysinfo/scaleway.js b/src/sysinfo/scaleway.js
deleted file mode 100644
index 0930e200b..000000000
--- a/src/sysinfo/scaleway.js
+++ /dev/null
@@ -1,33 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    getServerIp,
-    testConfig
-};
-
-var assert = require('assert'),
-    BoxError = require('../boxerror.js'),
-    superagent = require('superagent'),
-    util = require('util');
-
-function getServerIp(config, callback) {
-    assert.strictEqual(typeof config, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    superagent.get('http://169.254.42.42/conf').timeout(30 * 1000).end(function (error, result) {
-        if (error) return callback(new BoxError(BoxError.EXTERNAL_ERROR, error.status ? 'Request failed: ' + error.status : 'Network failure'));
-        if (result.statusCode !== 200) return callback(new BoxError(BoxError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body)));
-
-        var kv = result.text.split('\n').filter(function (line) { return line.startsWith('PUBLIC_IP_ADDRESS='); });
-        if (kv.length !== 1) return callback(new BoxError(BoxError.EXTERNAL_ERROR, util.format('%s %j', result.status, result.body)));
-
-        callback(null, kv[0].split('=')[1]);
-    });
-}
-
-function testConfig(config, callback) {
-    assert.strictEqual(typeof config, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    callback(null);
-}