diff --git a/meteor/collections/apps.js b/meteor/collections/apps.js
index 3b0ff8b147..05006eb8e2 100755
--- a/meteor/collections/apps.js
+++ b/meteor/collections/apps.js
@@ -116,3 +116,14 @@ Apps.helpers({
 });
 
 Apps.attachSchema(schemaApps);
+
+Apps.after.remove(function (userId, app) {
+  deleteApp(app, function (err) {
+    if (err) { console.error(err); }
+    var appPath = path.join(KITE_PATH, app.name);
+    deleteFolder(appPath);
+    removeBindFolder(app.name, function () {
+      console.log('Deleted Kite ' + app.name + ' directory.');
+    });
+  });
+});
diff --git a/meteor/server/apps.js b/meteor/server/apps.js
index af9383afa3..07a51cfa58 100755
--- a/meteor/server/apps.js
+++ b/meteor/server/apps.js
@@ -29,6 +29,7 @@ recoverApps = function (callback) {
 
 Meteor.methods({
   recoverApps: function () {
+    this.unblock();
     return Meteor._wrapAsync(recoverApps)();
   },
   configVar: function (appId, configVars) {
@@ -48,19 +49,10 @@ Meteor.methods({
     if (!app) {
       throw new Meteor.Error(403, 'No app found with this ID');
     }
-    deleteApp(app, function (err) {
-      if (err) { console.error(err); }
-      var appPath = path.join(KITE_PATH, app.name);
-      deleteFolder(appPath);
-      removeBindFolder(app.name, function () {
-        console.log('Deleted Kite ' + app.name + ' directory.');
-        Fiber(function () {
-          Apps.remove({_id: app._id});
-        }).run();
-      });
-    });
+    Apps.remove({_id: app._id});
   },
   createApp: function (formData) {
+    this.unblock();
     var validationResult = formValidate(formData, FormSchema.formCreateApp);
     if (validationResult.errors) {
       throw new Meteor.Error(400, 'Validation Failed.', validationResult.errors);
@@ -123,6 +115,7 @@ Meteor.methods({
     }
   },
   resolveWatchers: function () {
+    this.unblock();
     return Meteor._wrapAsync(resolveWatchers)();
   }
 });
diff --git a/meteor/server/constants.js b/meteor/server/constants.js
new file mode 100644
index 0000000000..e3fd37c46e
--- /dev/null
+++ b/meteor/server/constants.js
@@ -0,0 +1,24 @@
+KITE_PATH = path.join(getHomePath(), 'Kitematic');
+KITE_TAR_PATH = path.join(KITE_PATH, '.tar');
+KITE_IMAGES_PATH = path.join(KITE_PATH, '.images');
+
+if (!fs.existsSync(KITE_PATH)) {
+  console.log('Created Kitematic directory.');
+  fs.mkdirSync(KITE_PATH, function (err) {
+    if (err) { throw err; }
+  });
+}
+
+if (!fs.existsSync(KITE_TAR_PATH)) {
+  console.log('Created Kitematic .tar directory.');
+  fs.mkdirSync(KITE_TAR_PATH, function (err) {
+    if (err) { throw err; }
+  });
+}
+
+if (!fs.existsSync(KITE_IMAGES_PATH)) {
+  console.log('Created Kitematic .images directory.');
+  fs.mkdirSync(KITE_IMAGES_PATH, function (err) {
+    if (err) { throw err; }
+  });
+}
diff --git a/meteor/server/docker.js b/meteor/server/docker.js
index f5a3a022fe..c46ec6de30 100755
--- a/meteor/server/docker.js
+++ b/meteor/server/docker.js
@@ -632,12 +632,14 @@ Meteor.methods({
   runApp: function (app) {
     this.unblock();
     var image = Images.findOne({_id: app.imageId});
+    // Delete old container if one already exists
     try {
       Docker.removeContainerSync(app.name);
     } catch (e) {}
     try {
       var container = Docker.runContainerSync(app, image);
       var containerData = Docker.getContainerDataSync(container.id);
+      // Set a delay for app to spin up
       Meteor.setTimeout(function () {
         Apps.update(app._id, {$set: {
           docker: containerData,
@@ -652,18 +654,23 @@ Meteor.methods({
     return DOCKER_HOST;
   },
   reloadDefaultContainers: function () {
+    this.unblock();
     return Meteor._wrapAsync(reloadDefaultContainers)();
   },
   checkDefaultImages: function () {
+    this.unblock();
     return Meteor._wrapAsync(checkDefaultImages)();
   },
   resolveDefaultImages: function () {
+    this.unblock();
     return Meteor._wrapAsync(resolveDefaultImages)();
   },
   checkDefaultContainers: function () {
+    this.unblock();
     return Meteor._wrapAsync(checkDefaultContainers)();
   },
   resolveDefaultContainers: function () {
+    this.unblock();
     return Meteor._wrapAsync(resolveDefaultContainers)();
   }
 });
diff --git a/meteor/server/images.js b/meteor/server/images.js
index 5429dd53b1..f83f21da7f 100755
--- a/meteor/server/images.js
+++ b/meteor/server/images.js
@@ -125,6 +125,7 @@ Meteor.methods({
     });
   },
   validateDirectory: function (directory) {
+    this.unblock();
     if (!hasDockerfile(directory)) {
       throw new Meteor.Error(400, "Only directories with Dockerfiles are supported now.");
     }
diff --git a/meteor/server/kite.js b/meteor/server/kite.js
deleted file mode 100755
index 712635616a..0000000000
--- a/meteor/server/kite.js
+++ /dev/null
@@ -1,59 +0,0 @@
-KITE_PATH = path.join(getHomePath(), 'Kitematic');
-KITE_TAR_PATH = path.join(KITE_PATH, '.tar');
-KITE_IMAGES_PATH = path.join(KITE_PATH, '.images');
-
-if (!fs.existsSync(KITE_PATH)) {
-  console.log('Created Kitematic directory.');
-  fs.mkdirSync(KITE_PATH, function (err) {
-    if (err) { throw err; }
-  });
-}
-
-if (!fs.existsSync(KITE_TAR_PATH)) {
-  console.log('Created Kitematic .tar directory.');
-  fs.mkdirSync(KITE_TAR_PATH, function (err) {
-    if (err) { throw err; }
-  });
-}
-
-if (!fs.existsSync(KITE_IMAGES_PATH)) {
-  console.log('Created Kitematic .images directory.');
-  fs.mkdirSync(KITE_IMAGES_PATH, function (err) {
-    if (err) { throw err; }
-  });
-}
-
-getImageJSON = function (directory) {
-  var KITE_JSON_PATH = path.join(directory, 'image.json');
-  if (fs.existsSync(KITE_JSON_PATH)) {
-    var data = fs.readFileSync(KITE_JSON_PATH, 'utf8');
-    return JSON.parse(data);
-  } else {
-    return null;
-  }
-};
-
-loadKiteVolumes = function (directory, appName) {
-  var KITE_VOLUMES_PATH = path.join(directory, 'volumes');
-  if (fs.existsSync(KITE_VOLUMES_PATH)) {
-    var destinationPath = path.join(KITE_PATH, appName);
-    copyFolder(KITE_VOLUMES_PATH, destinationPath);
-    console.log('Copied volumes for: ' + appName);
-  }
-};
-
-saveImageFolder = function (directory, imageId, callback) {
-  var destinationPath = path.join(KITE_IMAGES_PATH, imageId);
-  if (!fs.existsSync(destinationPath)) {
-    fs.mkdirSync(destinationPath, function (err) {
-      if (err) { callback(err); return; }
-    });
-    copyFolder(directory, destinationPath);
-    console.log('Copied image folder for: ' + imageId);
-    callback(null);
-  }
-};
-
-saveImageFolderSync = function (directory, imageId) {
-  return Meteor._wrapAsync(saveImageFolder)(directory, imageId);
-};
diff --git a/meteor/server/lib/utilities.js b/meteor/server/lib/utilities.js
index 6b4d68df1a..4be5a0edaa 100755
--- a/meteor/server/lib/utilities.js
+++ b/meteor/server/lib/utilities.js
@@ -51,3 +51,38 @@ copyFolder = function (src, dest) {
     }
   }
 };
+
+getImageJSON = function (directory) {
+  var KITE_JSON_PATH = path.join(directory, 'image.json');
+  if (fs.existsSync(KITE_JSON_PATH)) {
+    var data = fs.readFileSync(KITE_JSON_PATH, 'utf8');
+    return JSON.parse(data);
+  } else {
+    return null;
+  }
+};
+
+loadKiteVolumes = function (directory, appName) {
+  var KITE_VOLUMES_PATH = path.join(directory, 'volumes');
+  if (fs.existsSync(KITE_VOLUMES_PATH)) {
+    var destinationPath = path.join(KITE_PATH, appName);
+    copyFolder(KITE_VOLUMES_PATH, destinationPath);
+    console.log('Copied volumes for: ' + appName);
+  }
+};
+
+saveImageFolder = function (directory, imageId, callback) {
+  var destinationPath = path.join(KITE_IMAGES_PATH, imageId);
+  if (!fs.existsSync(destinationPath)) {
+    fs.mkdirSync(destinationPath, function (err) {
+      if (err) { callback(err); return; }
+    });
+    copyFolder(directory, destinationPath);
+    console.log('Copied image folder for: ' + imageId);
+    callback(null);
+  }
+};
+
+saveImageFolderSync = function (directory, imageId) {
+  return Meteor._wrapAsync(saveImageFolder)(directory, imageId);
+};