diff --git a/src/cloudron.js b/src/cloudron.js
index f2140c107..f95a248b1 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -63,7 +63,6 @@ var appdb = require('./appdb.js'),
     subdomains = require('./subdomains.js'),
     superagent = require('superagent'),
     sysinfo = require('./sysinfo.js'),
-    taskmanager = require('./taskmanager.js'),
     tokendb = require('./tokendb.js'),
     updateChecker = require('./updatechecker.js'),
     user = require('./user.js'),
@@ -136,7 +135,6 @@ function initialize(callback) {
     async.series([
         certificates.initialize,
         settings.initialize,
-        platform.initialize,
         installAppBundle,
         checkConfigState,
         configureDefaultServer
@@ -148,13 +146,10 @@ function uninitialize(callback) {
 
     exports.events = null;
 
-    platform.events.removeListener(platform.EVENT_READY, onPlatformReady);
-
     async.series([
         cron.uninitialize,
-        taskmanager.pauseTasks,
         mailer.stop,
-        platform.uninitialize,
+        platform.stop,
         certificates.uninitialize,
         settings.uninitialize
     ], callback);
@@ -172,7 +167,6 @@ function onConfigured(callback) {
 
     gConfigState.configured = true;
 
-    platform.events.on(platform.EVENT_READY, onPlatformReady);
     settings.events.on(settings.DNS_CONFIG_KEY, function () { addDnsRecords(); });
 
     async.series([
@@ -187,16 +181,6 @@ function onConfigured(callback) {
     ], callback);
 }
 
-function onPlatformReady(callback) {
-    callback = callback || NOOP_CALLBACK;
-
-    debug('onPlatformReady');
-
-    async.series([
-        taskmanager.resumeTasks
-    ], callback);
-}
-
 function getConfigStateSync() {
     return gConfigState;
 }
diff --git a/src/platform.js b/src/platform.js
index eff7e1d31..75cc5fd18 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -1,14 +1,8 @@
 'use strict';
 
 exports = module.exports = {
-    initialize: initialize,
-    uninitialize: uninitialize,
-
     start: start,
-
-    events: null,
-
-    EVENT_READY: 'ready'
+    stop: stop
 };
 
 var apps = require('./apps.js'),
@@ -29,6 +23,7 @@ var apps = require('./apps.js'),
     settings = require('./settings.js'),
     shell = require('./shell.js'),
     subdomains = require('./subdomains.js'),
+    taskmanager = require('./taskmanager.js'),
     user = require('./user.js'),
     util = require('util'),
     _ = require('underscore');
@@ -37,13 +32,6 @@ var gPlatformReadyTimer = null;
 
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
-function initialize(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    exports.events = new (require('events').EventEmitter)();
-    return callback();
-}
-
 function start(callback) {
     assert.strictEqual(typeof callback, 'function');
 
@@ -89,13 +77,11 @@ function start(callback) {
     });
 }
 
-function uninitialize(callback) {
+function stop(callback) {
     clearTimeout(gPlatformReadyTimer);
     gPlatformReadyTimer = null;
-
     exports.events = null;
-
-    callback();
+    taskmanager.pauseTasks(callback);
 }
 
 function emitPlatformReady() {
@@ -105,7 +91,7 @@ function emitPlatformReady() {
     gPlatformReadyTimer = setTimeout(function () {
         debug('emitting platform ready');
         gPlatformReadyTimer = null;
-        exports.events.emit(exports.EVENT_READY);
+        taskmanager.resumeTasks();
     }, 30000);
 }