cleanup
diff --git a/lib/ParamedicApp.js b/lib/ParamedicApp.js
index 62fecbe..826ec5a 100644
--- a/lib/ParamedicApp.js
+++ b/lib/ParamedicApp.js
@@ -26,7 +26,6 @@
 const PluginsManager = require('./PluginsManager');
 const appPatcher = require('./appium/helpers/appPatcher');
 const { logger, exec, execPromise, utilities } = require('./utils');
-// const ParamedicTargetChooser = require('./ParamedicTargetChooser');
 
 class ParamedicApp {
     constructor (config, storedCWD, runner) {
@@ -169,23 +168,6 @@
             return cmd.join(' ');
         }
 
-        /*
-        // For now we always trying to run test app on emulator
-        return (new ParamedicTargetChooser(this.tempFolder.name, this.config)).chooseTarget(
-            true, // useEmulator
-            this.config.getTarget() // preferredTarget
-        ).then(targetObj => {
-            this.targetObj = targetObj;
-
-            return cmd
-                .concat(['--target', `"${this.targetObj.target}"`])
-                // CB-11472 In case of iOS provide additional '--emulator' flag, otherwise
-                // 'cordova run ios --target' would hang waiting for device with name
-                // as specified in 'target' in case if any device is physically connected
-                .concat(this.isIos ? ['--emulator'] : [])
-                .join(' ');
-        });
-        */
         return cmd
             .concat(this.isIos ? ['--emulator'] : [])
             .join(' ');
diff --git a/lib/ParamedicSauceLabs.js b/lib/ParamedicSauceLabs.js
index fb8b987..eae3044 100644
--- a/lib/ParamedicSauceLabs.js
+++ b/lib/ParamedicSauceLabs.js
@@ -400,7 +400,7 @@
         return Q()
             .then(() => {
                 if (!this.isBrowser) {
-                    // Package "Upload" app
+                    // Package & Upload app
                     return this.packageApp()
                         .then(() => this.uploadApp());
                 }