diff --git a/src/vs/base/parts/ipc/test/node/ipc.perf.ts b/src/vs/base/parts/ipc/test/node/ipc.perf.ts
index 2694f1ab0faeb2ea438ad7f4de9cfccb9fc7ba7a..24f88b2bd71a3678c1657961b2dcb90add34d450 100644
--- a/src/vs/base/parts/ipc/test/node/ipc.perf.ts
+++ b/src/vs/base/parts/ipc/test/node/ipc.perf.ts
@@ -22,10 +22,6 @@ function createClient(): Client {
 suite('IPC performance', () => {
 
 	test('increasing batch size', () => {
-		if (process.env['VSCODE_PID']) {
-			return; // TODO@Ben find out why test fails when run from within VS Code
-		}
-
 		const client = createClient();
 		const channel = client.getChannel<ITestChannel>('test');
 		const service = new TestServiceClient(channel);
@@ -67,10 +63,6 @@ suite('IPC performance', () => {
 	});
 
 	test('increasing raw data size', () => {
-		if (process.env['VSCODE_PID']) {
-			return; // TODO@Ben find out why test fails when run from within VS Code
-		}
-
 		const client = createClient();
 		const channel = client.getChannel<ITestChannel>('test');
 		const service = new TestServiceClient(channel);
diff --git a/src/vs/platform/opener/browser/openerService.ts b/src/vs/platform/opener/browser/openerService.ts
index 6d5dc1011feb70e1186c2fdb4cce18e9cd925e86..7c33ad82d9a938049ff7102433a92b02bc47054f 100644
--- a/src/vs/platform/opener/browser/openerService.ts
+++ b/src/vs/platform/opener/browser/openerService.ts
@@ -61,7 +61,7 @@ export class OpenerService implements IOpenerService {
 				// remove fragment
 				resource = resource.with({ fragment: '' });
 			} else if (resource.scheme === Schemas.file) {
-				resource = URI.file(normalize(resource.fsPath)); // TODO@Ben workaround for non-normalized paths (https://github.com/Microsoft/vscode/issues/12954)
+				resource = URI.file(normalize(resource.fsPath)); // workaround for non-normalized paths (https://github.com/Microsoft/vscode/issues/12954)
 			}
 			promise = this._editorService.openEditor({ resource, options: { selection, } }, options && options.openToSide);
 		}
diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 5c769f4fc511bc39c6a76708d85bb69c0226c089..3f7fe6457ed4aac9ce554c590ce755f1254f99f5 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -401,7 +401,7 @@ export class OpenToSideAction extends Action {
 	public static OPEN_TO_SIDE_ID = 'workbench.action.openToSide';
 	public static OPEN_TO_SIDE_LABEL = nls.localize('openToSide', "Open to the Side");
 
-	constructor( @IWorkbenchEditorService private editorService: IWorkbenchEditorService) {
+	constructor(@IWorkbenchEditorService private editorService: IWorkbenchEditorService) {
 		super(OpenToSideAction.OPEN_TO_SIDE_ID, OpenToSideAction.OPEN_TO_SIDE_LABEL);
 
 		this.class = 'quick-open-sidebyside';
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index c542173207fc0e98021a4fef3bd0805ceb20bfe5..8f4c719e87328e98c24200da9b070a1268954810 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -191,7 +191,6 @@ function registerDiffEditorCommands(): void {
 	});
 }
 
-// TODO@Ben remove eventually
 function handleCommandDeprecations(): void {
 	const mapDeprecatedCommands = {
 		'workbench.action.focusFirstEditor': 'workbench.action.focusFirstEditorGroup',
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index 76e25d003087c76309f56bb09c82cdc517079d40..8054efc6f45319d936ab486e6843b353dfa834c5 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -569,7 +569,7 @@ CommandsRegistry.registerCommand('_workbench.diff', function (accessor: Services
 	return TPromise.join([editorService.createInput({ resource: left }), editorService.createInput({ resource: right })]).then(inputs => {
 		const [left, right] = inputs;
 
-		const diff = new DiffEditorInput(label, undefined, <EditorInput>left, <EditorInput>right);
+		const diff = new DiffEditorInput(label, void 0, <EditorInput>left, <EditorInput>right);
 		return editorService.openEditor(diff);
 	}).then(() => {
 		return void 0;
diff --git a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts
index ae8d044e5e35a44ca0f6b3bdf4f13145af50c670..680f09ad821825a35205131a28a59bfb98ae3339 100644
--- a/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts
+++ b/src/vs/workbench/test/browser/parts/quickOpen/quickopen.perf.test.ts
@@ -40,6 +40,10 @@ declare var __dirname: string;
 suite('QuickOpen performance', () => {
 
 	test('Measure', () => {
+		if (process.env['VSCODE_PID']) {
+			return; // TODO@Christoph find out why test fails when run from within VS Code
+		}
+
 		const n = 3;
 		const argv = minimist(process.argv);
 		const testWorkspaceArg = argv['testWorkspace'];