diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 6f426bf0e85924c3100e008a8960fe9775a502a9..289c61b7d888debb97c05031deacd1089a93ea16 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -90,10 +90,6 @@ export interface IPath {
 
 export interface IWindowConfiguration extends ICommandLineArguments {
 
-	// TODO@Ben things to still clean up
-	appSettingsHome: string;
-	userExtensionsHome: string;
-
 	// Used to configure the workbench when opening
 	workspacePath?: string;
 	recentFiles: string[];
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 0b9be2e79f91d0bf82a51b36eb78b11b7adc548c..9b93d07b21b5072a1018d4ee9f96a63ab5f37a8d 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -726,16 +726,14 @@ export class WindowsManager implements IWindowsService {
 
 	private toConfiguration(userEnv: IProcessEnvironment, cli: ICommandLineArguments, workspacePath?: string, filesToOpen?: IPath[], filesToCreate?: IPath[], filesToDiff?: IPath[], extensionsToInstall?: string[]): IWindowConfiguration {
 		let configuration: IWindowConfiguration = mixin({}, cli); // inherit all properties from CLI
+		configuration.appRoot = this.envService.appRoot;
+		configuration.execPath = process.execPath;
+		configuration.userEnv = userEnv;
 		configuration.workspacePath = workspacePath;
 		configuration.filesToOpen = filesToOpen;
 		configuration.filesToCreate = filesToCreate;
 		configuration.filesToDiff = filesToDiff;
 		configuration.extensionsToInstall = extensionsToInstall;
-		configuration.appRoot = this.envService.appRoot;
-		configuration.execPath = process.execPath;
-		configuration.appSettingsHome = this.envService.appSettingsHome;
-		configuration.userExtensionsHome = this.envService.userExtensionsHome;
-		configuration.userEnv = userEnv;
 
 		const recents = this.getRecentlyOpenedPaths(workspacePath, filesToOpen);
 		configuration.recentFiles = recents.files;
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index ff524ab9ded809fe9cc3db6f88e499c858b68bc4..71654091cfc4fa4e9ac3bfe5272d257c29d7a9e3 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -87,11 +87,6 @@ export interface IConfiguration {
 export interface IEnvironment {
 	appRoot: string;
 
-	appSettingsHome: string;
-
-	disableExtensions: boolean;
-
-	userExtensionsHome: string;
 	extensionDevelopmentPath: string;
 	extensionTestsPath: string;
 
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 2d5c07ee71a293f9de9bd8907853840dedbeb5ef..1289b8d27614991aab7bb499ff9250724ca5b908 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -252,7 +252,7 @@ export class WorkbenchShell {
 			const config: ITelemetryServiceConfig = {
 				appender: new TelemetryAppenderClient(channel),
 				commonProperties: resolveWorkbenchCommonProperties(this.storageService, commit, version),
-				piiPaths: [this.environmentService.appRoot, this.configuration.env.userExtensionsHome]
+				piiPaths: [this.environmentService.appRoot, this.environmentService.extensionsPath]
 			};
 
 			const telemetryService = instantiationService.createInstance(TelemetryService, config);