diff --git a/client/cloudcmd.js b/client/cloudcmd.js
index 053adefc..9de37a16 100644
--- a/client/cloudcmd.js
+++ b/client/cloudcmd.js
@@ -1,5 +1,11 @@
 'use strict';
 
+// prevent additional loading of exec by spero, remedy, ishtar, salam, omnes
+window.exec = require('execon');
+
+// prevent additional loading of emitify
+window.Emitify = require('emitify');
+
 window.CloudCmd = (config) => {
     window.Util = require('../common/util');
     window.CloudFunc = require('../common/cloudfunc');
diff --git a/client/directory.js b/client/directory.js
index 44828679..1d464909 100644
--- a/client/directory.js
+++ b/client/directory.js
@@ -24,7 +24,7 @@ function uploadDirectory(items) {
         return item.webkitGetAsEntry();
     });
     
-    array = array.map(function(name) {
+    array = array.map((name) => {
         const result = [
             '/modules/' + name,
             '/lib/' + name,
@@ -34,12 +34,6 @@ function uploadDirectory(items) {
         return result;
     });
     
-    if (!window.Emitify)
-        window.Emitify = require('emitify');
-    
-    if (!window.exec)
-        window.exec = require('execon');
-    
     const url = CloudCmd.join(array);
     
     load.js(url, () => {
diff --git a/client/operation.js b/client/operation.js
index 0652c637..1133cea2 100644
--- a/client/operation.js
+++ b/client/operation.js
@@ -15,11 +15,6 @@ const currify = require('currify/legacy');
 const exec = require('execon');
 const emitify = require('emitify');
 
-// prevent loading of exec by spero, remedy, ishtar, salam, omnes
-window.exec = exec;
-// prevent loading of emitify
-window.Emitify = emitify;
-
 const RESTful = require('./rest');
 
 function OperationProto(operation, data) {