diff --git a/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts b/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts
index b74f6b32e603e3e354a6110c7252f0fccae2b9d5..35646d5d0e3d800ee921c05f5194274782024f6c 100644
--- a/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts
+++ b/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts
@@ -4,17 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import {TPromise} from 'vs/base/common/winjs.base';
 import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
-import {IIdentifiedSingleEditOperation} from 'vs/editor/common/editorCommon';
-import {EditorModel} from 'vs/workbench/common/editor';
 import URI from 'vs/base/common/uri';
 import {URL} from 'vs/base/common/network';
-import {Position} from 'vs/editor/common/core/position';
-import {Range} from 'vs/editor/common/core/range';
 import {IModeService} from 'vs/editor/common/services/modeService';
 import {IModelService} from 'vs/editor/common/services/modelService';
-import {EditOperation} from 'vs/editor/common/core/editOperation';
 
 /**
  * An editor model whith an in-memory, readonly content that is backed by an existing editor model.
diff --git a/src/vs/workbench/browser/parts/editor/stringEditorModel.ts b/src/vs/workbench/browser/parts/editor/stringEditorModel.ts
index 56feb1e59700a15186828f69c52639d9daee988e..9ae7491dd0e629ea7197c0e66ba9a1d9a3baaaac 100644
--- a/src/vs/workbench/browser/parts/editor/stringEditorModel.ts
+++ b/src/vs/workbench/browser/parts/editor/stringEditorModel.ts
@@ -100,10 +100,6 @@ export class StringEditorModel extends BaseTextEditorModel {
 		return null;
 	}
 
-	public setMime(mime: string): void {
-		this.mime = mime;
-	}
-
 	public getMime(): string {
 		return this.mime;
 	}
@@ -112,12 +108,12 @@ export class StringEditorModel extends BaseTextEditorModel {
 
 		// Create text editor model if not yet done
 		if (!this.textEditorModel) {
-			return this.createTextEditorModel(this.value, this.mime, this.resource);
+			return this.createTextEditorModel(this.value, this.resource, this.mime);
 		}
 
 		// Otherwise update
 		else {
-			this.updateTextEditorModel(this.value, this.mime);
+			this.updateTextEditorModel(this.value);
 		}
 
 		return TPromise.as<EditorModel>(this);
diff --git a/src/vs/workbench/browser/parts/editor/textEditorModel.ts b/src/vs/workbench/browser/parts/editor/textEditorModel.ts
index 23ecb5330703187973123040dd804be891a9a73e..f14f8bbfbf30a090632ca74dc4a6be36ff081552 100644
--- a/src/vs/workbench/browser/parts/editor/textEditorModel.ts
+++ b/src/vs/workbench/browser/parts/editor/textEditorModel.ts
@@ -41,7 +41,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 	/**
 	 * Creates the text editor model with the provided value, mime (can be comma separated for multiple values) and optional resource URL.
 	 */
-	protected createTextEditorModel(value: string, mime?: string, resource?: URI): TPromise<EditorModel> {
+	protected createTextEditorModel(value: string, resource?: URI, mime?: string): TPromise<EditorModel> {
 		let firstLineText = this.getFirstLineText(value);
 
 		// To avoid flickering, give the mode at most 50ms to load. If the mode doesn't load in 50ms, proceed creating the model with a mode promise
diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditorModel.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditorModel.ts
index c6abef3c064777b441de712fe08a6d290a527643..52bfd91a20ca9a7e4aace016c43618582bb55b7b 100644
--- a/src/vs/workbench/parts/files/browser/editors/textFileEditorModel.ts
+++ b/src/vs/workbench/parts/files/browser/editors/textFileEditorModel.ts
@@ -289,7 +289,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin
 			else {
 				diag('load() - created text editor model', this.resource, new Date());
 
-				this.createTextEditorModelPromise = this.createTextEditorModel(content.value, null, content.resource).then(() => {
+				this.createTextEditorModelPromise = this.createTextEditorModel(content.value, content.resource).then(() => {
 					this.createTextEditorModelPromise = null;
 
 					this.setDirty(false); // Ensure we are not tracking a stale state
diff --git a/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts b/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
index f507681903c10c3305e5f6d5169b37046e690614..2a0f2af2546a33ed99ae426b2208caed9e273209 100644
--- a/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
+++ b/src/vs/workbench/test/browser/parts/editor/editorModel.test.ts
@@ -35,7 +35,7 @@ suite("Workbench - EditorModel", () => {
 		let m = new MyTextEditorModel(modelService, modeService);
 		m.load().then(function(model: any) {
 			assert(model === m);
-			return model.createTextEditorModel("foo", "text/plain").then(function() {
+			return model.createTextEditorModel("foo", null, "text/plain").then(function() {
 				assert.strictEqual(m.isResolved(), true);
 			});
 		}).done(() => {