diff --git a/lib/common b/lib/common
index d3763a8474..8426225275 160000
--- a/lib/common
+++ b/lib/common
@@ -1 +1 @@
-Subproject commit d3763a84749ceef805162f1bc57a1b0e9ce50456
+Subproject commit 8426225275bc36770ea536008230a62059be3219
diff --git a/lib/options.ts b/lib/options.ts
index cfe1bcb655..e0c29014f9 100644
--- a/lib/options.ts
+++ b/lib/options.ts
@@ -6,37 +6,27 @@ import commonOptions = require("./common/options");
 import osenv = require("osenv");
 
 var knownOpts:any = {
-		"log" : String,
-		"verbose" : Boolean,
-		"path" : String,
 		"frameworkPath": String,
-		"appid" : String,
 		"copy-from": String,
 		"link-to": String,
 		"release": Boolean,
 		"device": Boolean,
 		"emulator": Boolean,
-		"version": Boolean,
-		"help": Boolean,
 		"keyStorePath": String,
 		"keyStorePassword": String,
 		"keyStoreAlias": String,
 		"keyStoreAliasPassword": String
 	},
 	shorthands = {
-		"v" : "verbose",
-		"p" : "path"
 	};
 
 _.extend(knownOpts, commonOptions.knownOpts);
 _.extend(shorthands, commonOptions.shorthands);
 
-var defaultProfileDir = path.join(osenv.home(), ".nativescript-cli");
+commonOptions.setProfileDir(".nativescript-cli");
 var parsed = helpers.getParsedOptions(knownOpts, shorthands);
-parsed["profile-dir"] = parsed["profile-dir"] || defaultProfileDir;
 
 Object.keys(parsed).forEach((opt) => exports[opt] = parsed[opt]);
-
 exports.knownOpts = knownOpts;
 
 declare var exports:any;
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
index 9c07b0d5cd..0c74c5b82c 100644
--- a/lib/services/platform-service.ts
+++ b/lib/services/platform-service.ts
@@ -263,7 +263,7 @@ export class PlatformService implements IPlatformService {
 
 			var logFilePath = path.join(platformData.projectRoot, this.$projectData.projectName, "emulator.log");
 
-			emulatorServices.startEmulator(packageFile, {image: options.emulator, stderrFilePath: logFilePath, stdoutFilePath: logFilePath }).wait();
+			emulatorServices.startEmulator(packageFile, { stderrFilePath: logFilePath, stdoutFilePath: logFilePath }).wait();
 		}).future<void>()();
 	}