diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 8b6f26a28c7..b2948232b95 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -89,10 +89,10 @@ export interface IPath {
 }
 
 export interface IWindowConfiguration extends ICommandLineArguments {
-	version: string;
+
+	// TODO@Ben things to still clean up
 	appSettingsHome: string;
 	userExtensionsHome: string;
-	appRoot: string;
 
 	// Used to configure the workbench when opening
 	workspacePath?: string;
@@ -104,6 +104,7 @@ export interface IWindowConfiguration extends ICommandLineArguments {
 	extensionsToInstall: string[];
 
 	// Used to send the main process environment over to the renderer
+	appRoot: string;
 	userEnv: IProcessEnvironment;
 }
 
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 41554b10fd1..861e188f6a6 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -12,7 +12,6 @@ import * as nls from 'vs/nls';
 import * as paths from 'vs/base/common/paths';
 import * as arrays from 'vs/base/common/arrays';
 import { assign, mixin } from 'vs/base/common/objects';
-import pkg from 'vs/platform/package';
 import { EventEmitter } from 'events';
 import { IStorageService } from 'vs/code/electron-main/storage';
 import { IPath, VSCodeWindow, ReadyState, IWindowConfiguration, IWindowState as ISingleWindowState, defaultWindowState } from 'vs/code/electron-main/window';
@@ -733,7 +732,6 @@ export class WindowsManager implements IWindowsService {
 		configuration.filesToDiff = filesToDiff;
 		configuration.extensionsToInstall = extensionsToInstall;
 		configuration.appRoot = this.envService.appRoot;
-		configuration.version = pkg.version;
 		configuration.appSettingsHome = this.envService.appSettingsHome;
 		configuration.userExtensionsHome = this.envService.userExtensionsHome;
 		configuration.userEnv = userEnv;
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index ac68349ae49..c9bc4cb0cf7 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -87,8 +87,6 @@ export interface IConfiguration {
 export interface IEnvironment {
 	appRoot: string;
 
-	version: string;
-
 	appSettingsHome: string;
 
 	disableExtensions: boolean;
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 43890075790..aa36bbf1948 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -10,6 +10,7 @@ import * as Platform from 'vs/base/common/platform';
 import {IThreadService} from 'vs/workbench/services/thread/common/threadService';
 import * as errors from 'vs/base/common/errors';
 import product from 'vs/platform/product';
+import pkg from 'vs/platform/package';
 import {ExtHostFileSystemEventService} from 'vs/workbench/api/node/extHostFileSystemEventService';
 import {ExtHostDocuments} from 'vs/workbench/api/node/extHostDocuments';
 import {ExtHostConfiguration} from 'vs/workbench/api/node/extHostConfiguration';
@@ -128,7 +129,7 @@ export class ExtHostAPIImplementation {
 		registerApiCommands(extHostCommands);
 
 
-		this.version = contextService.getConfiguration().env.version;
+		this.version = pkg.version;
 		this.Uri = URI;
 		this.Location = extHostTypes.Location;
 		this.Diagnostic = extHostTypes.Diagnostic;
diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index d47aeeb8687..23515548c66 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -13,6 +13,7 @@ import pfs = require('vs/base/node/pfs');
 import URI from 'vs/base/common/uri';
 import {TPromise} from 'vs/base/common/winjs.base';
 import paths = require('vs/base/common/paths');
+import pkg from 'vs/platform/package';
 import {IExtensionDescription} from 'vs/platform/extensions/common/extensions';
 import {ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry';
 import {ExtHostAPIImplementation, defineAPI} from 'vs/workbench/api/node/extHost.api.impl';
@@ -163,7 +164,7 @@ export class ExtensionHostMain {
 		let collector = new MessagesCollector();
 		let env = this._contextService.getConfiguration().env;
 
-		return ExtensionHostMain.scanExtensions(collector, BUILTIN_EXTENSIONS_PATH, !env.disableExtensions ? env.userExtensionsHome : void 0, !env.disableExtensions ? env.extensionDevelopmentPath : void 0, env.version)
+		return ExtensionHostMain.scanExtensions(collector, BUILTIN_EXTENSIONS_PATH, !env.disableExtensions ? env.userExtensionsHome : void 0, !env.disableExtensions ? env.extensionDevelopmentPath : void 0, pkg.version)
 			.then(null, err => {
 				collector.error('', err);
 				return [];