diff --git a/lib/appium.js b/lib/appium.js
index e03acc4d9a8..9bdaa68878d 100644
--- a/lib/appium.js
+++ b/lib/appium.js
@@ -253,14 +253,7 @@ Appium.prototype.configureApp = function(desiredCaps, hasAppInCaps, cb) {
       this.isSafariLauncherApp = true;
       this.configureLocalApp("./build/SafariLauncher/SafariLauncher.zip", origin, cb);
     } else {
-      if (parseFloat(this.desiredCapabilities.version) >= 7) {
-        this.configureSafariForLauncher(desiredCaps, function() {
-          this.isSafariLauncherApp = true;
-          this.configureLocalApp("./build/SafariLauncher/SafariLauncherSim.zip", origin, cb);
-        }.bind(this));
-      } else {
-        this.configureSafari(desiredCaps, cb);
-      }
+      this.configureSafari(desiredCaps, cb);
     }
   } else if (this.isIos() && appPath.toLowerCase() === "iwebview") {
     this.desiredCapabilities.iwebview = true;
diff --git a/lib/server/parser.js b/lib/server/parser.js
index dd9de8d1de4..ce079eb9991 100644
--- a/lib/server/parser.js
+++ b/lib/server/parser.js
@@ -227,7 +227,7 @@ var args = [
     , help: "(IOS-Simulator-only) name of the iOS device to use"
   }],
 
-  [['--default-device'], {
+  [['--default-device', '-dd'], {
     dest: 'defaultDevice'
     , defaultValue: false
     , action: 'storeTrue'
diff --git a/reset.sh b/reset.sh
index 89aa620139b..4e3d04757a8 100755
--- a/reset.sh
+++ b/reset.sh
@@ -180,18 +180,12 @@ reset_ios() {
     run_cmd rm -rf build/fruitstrap
     run_cmd mkdir -p build/fruitstrap
     run_cmd cp submodules/fruitstrap/fruitstrap build/fruitstrap
-    echo "* Cloning/updating SafariLauncher"
-    run_cmd git submodule update --init submodules/SafariLauncher
-    echo "* Building SafariLauncher"
-    run_cmd rm -f submodules/Safarilauncher/target.xcconfig
-    echo "BUNDLE_ID = com.bytearc.SafariLauncher" >> submodules/Safarilauncher/target.xcconfig
-    run_cmd $grunt buildSafariLauncherApp:iphonesimulator:"target.xcconfig"
-    echo "* Copying SafariLauncher to build"
-    run_cmd rm -rf build/SafariLauncher
-    run_cmd mkdir -p build/SafariLauncher
-    run_cmd zip -r build/SafariLauncher/SafariLauncherSim submodules/SafariLauncher/build/Release-iphonesimulator/SafariLauncher.app
     if $should_reset_realsafari; then
+        echo "* Cloning/updating SafariLauncher"
+        run_cmd git submodule update --init submodules/SafariLauncher
         echo "* Building SafariLauncher for real devices"
+        run_cmd rm -rf build/SafariLauncher
+        run_cmd mkdir -p build/SafariLauncher
         run_cmd rm -f submodules/Safarilauncher/target.xcconfig
         echo "BUNDLE_ID = com.bytearc.SafariLauncher" >> submodules/Safarilauncher/target.xcconfig
         if [[ ! -z $code_sign_identity ]]; then