diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts
index 41bd56c7b1a..0324fd61340 100644
--- a/src/vs/workbench/browser/parts/editor/editorStatus.ts
+++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts
@@ -34,7 +34,6 @@ import {IEditor as IBaseEditor} from 'vs/platform/editor/common/editor';
 import {IWorkbenchEditorService}  from 'vs/workbench/services/editor/common/editorService';
 import {IQuickOpenService, IPickOpenEntry} from 'vs/workbench/services/quickopen/common/quickOpenService';
 import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
-import {IEventService} from 'vs/platform/event/common/event';
 import {IFilesConfiguration, SUPPORTED_ENCODINGS} from 'vs/platform/files/common/files';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {IModeService} from 'vs/editor/common/services/modeService';
@@ -241,7 +240,6 @@ export class EditorStatus implements IStatusbarItem {
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IQuickOpenService private quickOpenService: IQuickOpenService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IEventService private eventService: IEventService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IModeService private modeService: IModeService,
 		@ITextFileService private textFileService: ITextFileService,
diff --git a/src/vs/workbench/common/editor/untitledEditorInput.ts b/src/vs/workbench/common/editor/untitledEditorInput.ts
index d0e265ba987..b61d85b01cf 100644
--- a/src/vs/workbench/common/editor/untitledEditorInput.ts
+++ b/src/vs/workbench/common/editor/untitledEditorInput.ts
@@ -16,7 +16,6 @@ import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
 import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 import {IModeService} from 'vs/editor/common/services/modeService';
 import {IDisposable, dispose} from 'vs/base/common/lifecycle';
-import {IEventService} from 'vs/platform/event/common/event';
 import Event, {Emitter} from 'vs/base/common/event';
 
 import {ITextFileService} from 'vs/workbench/parts/files/common/files'; // TODO@Ben layer breaker
@@ -46,8 +45,7 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IModeService private modeService: IModeService,
-		@ITextFileService private textFileService: ITextFileService,
-		@IEventService private eventService: IEventService
+		@ITextFileService private textFileService: ITextFileService
 	) {
 		super();
 
diff --git a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
index 8ed1d424ed3..b3815d5f526 100644
--- a/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
+++ b/src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
@@ -20,7 +20,6 @@ import {ITextFileService, BINARY_FILE_EDITOR_ID, FILE_EDITOR_INPUT_ID, FileEdito
 import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {IDisposable, dispose} from 'vs/base/common/lifecycle';
-import {IEventService} from 'vs/platform/event/common/event';
 
 /**
  * A file editor input is the input type for the file editor of file system resources.
@@ -47,7 +46,6 @@ export class FileEditorInput extends CommonFileEditorInput {
 		resource: URI,
 		mime: string,
 		preferredEncoding: string,
-		@IEventService private eventService: IEventService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@ITextFileService private textFileService: ITextFileService
diff --git a/src/vs/workbench/parts/files/common/editors/saveParticipant.ts b/src/vs/workbench/parts/files/common/editors/saveParticipant.ts
index f8285f7fa14..95bb3b7e3cc 100644
--- a/src/vs/workbench/parts/files/common/editors/saveParticipant.ts
+++ b/src/vs/workbench/parts/files/common/editors/saveParticipant.ts
@@ -14,7 +14,6 @@ import {IPosition, IModel} from 'vs/editor/common/editorCommon';
 import {Selection} from 'vs/editor/common/core/selection';
 import {trimTrailingWhitespace} from 'vs/editor/common/commands/trimTrailingWhitespaceCommand';
 import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
-import {IEventService} from 'vs/platform/event/common/event';
 import {TextFileEditorModel} from 'vs/workbench/parts/files/common/editors/textFileEditorModel';
 
 // The save participant can change a model before its saved to support various scenarios like trimming trailing whitespace
@@ -24,7 +23,6 @@ export class SaveParticipant implements ISaveParticipant, IWorkbenchContribution
 
 	constructor(
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IEventService private eventService: IEventService,
 		@ICodeEditorService private codeEditorService: ICodeEditorService
 	) {
 		this.toUnbind = [];
diff --git a/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts b/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts
index b389cbbd8ef..38ae8f9bc7f 100644
--- a/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts
+++ b/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts
@@ -20,7 +20,6 @@ import {ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorMod
 import {EncodingMode, EditorModel} from 'vs/workbench/common/editor';
 import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
 import {IFileService, IFileStat, IFileOperationResult, FileOperationResult} from 'vs/platform/files/common/files';
-import {IEventService} from 'vs/platform/event/common/event';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {IMessageService, Severity} from 'vs/platform/message/common/message';
 import {IModeService} from 'vs/editor/common/services/modeService';
@@ -64,7 +63,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 		@IMessageService private messageService: IMessageService,
 		@IModeService modeService: IModeService,
 		@IModelService modelService: IModelService,
-		@IEventService private eventService: IEventService,
 		@IFileService private fileService: IFileService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@ITelemetryService private telemetryService: ITelemetryService,
diff --git a/src/vs/workbench/parts/files/electron-browser/dirtyFilesTracker.ts b/src/vs/workbench/parts/files/electron-browser/dirtyFilesTracker.ts
index f5a8f581eae..7f3dcd72d01 100644
--- a/src/vs/workbench/parts/files/electron-browser/dirtyFilesTracker.ts
+++ b/src/vs/workbench/parts/files/electron-browser/dirtyFilesTracker.ts
@@ -11,7 +11,6 @@ import {IWorkbenchContribution} from 'vs/workbench/common/contributions';
 import {VIEWLET_ID, TextFileModelChangeEvent, ITextFileService, AutoSaveMode} from 'vs/workbench/parts/files/common/files';
 import {platform, Platform} from 'vs/base/common/platform';
 import {IWindowService} from 'vs/workbench/services/window/electron-browser/windowService';
-import {IEventService} from 'vs/platform/event/common/event';
 import {Position} from 'vs/platform/editor/common/editor';
 import {IEditorStacksModel} from 'vs/workbench/common/editor';
 import {IEditorGroupService} from 'vs/workbench/services/group/common/groupService';
@@ -36,7 +35,6 @@ export class DirtyFilesTracker implements IWorkbenchContribution {
 	private stacks: IEditorStacksModel;
 
 	constructor(
-		@IEventService private eventService: IEventService,
 		@ITextFileService private textFileService: ITextFileService,
 		@ILifecycleService private lifecycleService: ILifecycleService,
 		@IEditorGroupService private editorGroupService: IEditorGroupService,