diff --git a/build/lib/monaco-editor.d.ts b/build/lib/monaco-editor.d.ts
index bcaf4dc242d..ed68d9a56a6 100644
--- a/build/lib/monaco-editor.d.ts
+++ b/build/lib/monaco-editor.d.ts
@@ -1,4 +1,3 @@
-// TODO@Alex: Remove EventType, EmitterEvent, ListenerCallback, BulkListenerCallback, IEventEmitter
 
 declare module monaco.editor {
 
@@ -113,18 +112,6 @@ declare module monaco {
      *
      */
     export class Uri {
-        private static _empty;
-        private static _slash;
-        private static _regexp;
-        private static _driveLetterPath;
-        private static _upperCaseDrive;
-        private _scheme;
-        private _authority;
-        private _path;
-        private _query;
-        private _fragment;
-        private _formatted;
-        private _fsPath;
         constructor();
         /**
          * scheme is the 'http' part of 'http://www.msft.com/some/path?query#fragment'.
@@ -163,45 +150,27 @@ declare module monaco {
         withFragment(value: string): Uri;
         static parse(value: string): Uri;
         static file(path: string): Uri;
-        private static _parseComponents(value);
         static create(scheme?: string, authority?: string, path?: string, query?: string, fragment?: string): Uri;
-        private static _validate(ret);
         /**
          *
          * @param skipEncoding Do not encode the result, default is `false`
          */
         toString(skipEncoding?: boolean): string;
-        private static _asFormatted(uri, skipEncoding);
         toJSON(): any;
         static revive(data: any): Uri;
     }
 
-    // TODO@Alex: START remove this
 
     export class EmitterEvent {
-        private _type;
-        private _data;
         constructor(eventType?: string, data?: any);
         getType(): string;
         getData(): any;
     }
 
-    export interface ListenerCallback {
-        (value: any): void;
-    }
-
     export interface BulkListenerCallback {
         (value: EmitterEvent[]): void;
     }
 
-    export interface IEventEmitter extends IDisposable {
-        addListener2(eventType: string, listener: ListenerCallback): IDisposable;
-        addOneTimeDisposableListener(eventType: string, listener: ListenerCallback): IDisposable;
-        addBulkListener2(listener: BulkListenerCallback): IDisposable;
-        addEmitter2(eventEmitter: IEventEmitter): IDisposable;
-    }
-    // TODO@Alex: END remove this
-
 
     /**
      * Virtual Key Codes, the value does not hold any inherent meaning.
@@ -1219,8 +1188,6 @@ declare module monaco.editor {
             indentGuides: boolean;
             scrollbar: InternalEditorScrollbarOptions;
         });
-        private static _toSortedIntegerArray(source);
-        private static _numberArraysEqual(a, b);
         equals(other: InternalEditorViewOptions): boolean;
         createChangeEvent(newOpts: InternalEditorViewOptions): IViewConfigurationChangedEvent;
         clone(): InternalEditorViewOptions;
@@ -1934,7 +1901,15 @@ declare module monaco.editor {
     /**
      * A model.
      */
-    export interface IModel extends IReadOnlyModel, IEditableTextModel, ITextModelWithMarkers, ITokenizedModel, ITextModelWithTrackedRanges, ITextModelWithDecorations, IEventEmitter, IEditorModel {
+    export interface IModel extends IReadOnlyModel, IEditableTextModel, ITextModelWithMarkers, ITokenizedModel, ITextModelWithTrackedRanges, ITextModelWithDecorations, IEditorModel {
+        onDidChangeRawContent(listener: (e: IModelContentChangedEvent) => void): IDisposable;
+        onDidChangeContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
+        onDidChangeModeSupport(listener: (e: IModeSupportChangedEvent) => void): IDisposable;
+        onDidChangeDecorations(listener: (e: IModelDecorationsChangedEvent) => void): IDisposable;
+        onDidChangeOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
+        onDidChangeMode(listener: (e: IModelModeChangedEvent) => void): IDisposable;
+        onWillDispose(listener: () => void): IDisposable;
+        addBulkListener(listener: BulkListenerCallback): IDisposable;
         /**
          * A unique identifier associated with this model.
          */
@@ -2660,7 +2635,8 @@ declare module monaco.editor {
      * An editor.
      */
     export interface IEditor {
-        onDidChangeModelContent(listener: (e: IModelContentChangedEvent) => void): IDisposable;
+        onDidChangeModelRawContent(listener: (e: IModelContentChangedEvent) => void): IDisposable;
+        onDidChangeModelContent(listener: (e: IModelContentChangedEvent2) => void): IDisposable;
         onDidChangeModelMode(listener: (e: IModelModeChangedEvent) => void): IDisposable;
         onDidChangeModelOptions(listener: (e: IModelOptionsChangedEvent) => void): IDisposable;
         onDidChangeConfiguration(listener: (e: IConfigurationChangedEvent) => void): IDisposable;
@@ -2973,12 +2949,12 @@ declare module monaco.editor {
         ModelModeChanged: string;
         ModelModeSupportChanged: string;
         ModelOptionsChanged: string;
-        ModelContentChanged: string;
+        ModelRawContentChanged: string;
         ModelContentChanged2: string;
-        ModelContentChangedFlush: string;
-        ModelContentChangedLinesDeleted: string;
-        ModelContentChangedLinesInserted: string;
-        ModelContentChangedLineChanged: string;
+        ModelRawContentChangedFlush: string;
+        ModelRawContentChangedLinesDeleted: string;
+        ModelRawContentChangedLinesInserted: string;
+        ModelRawContentChangedLineChanged: string;
         EditorTextBlur: string;
         EditorTextFocus: string;
         EditorFocus: string;
diff --git a/build/lib/monaco-editor.d.ts.recipe b/build/lib/monaco-editor.d.ts.recipe
index 8e61c9056a2..6bec60236b9 100644
--- a/build/lib/monaco-editor.d.ts.recipe
+++ b/build/lib/monaco-editor.d.ts.recipe
@@ -1,4 +1,3 @@
-// TODO@Alex: Remove EventType, EmitterEvent, ListenerCallback, BulkListenerCallback, IEventEmitter
 
 declare module monaco.editor {
 
@@ -57,9 +56,7 @@ declare module monaco {
 
 #include(vs/base/common/uri): URI
 
-// TODO@Alex: START remove this
-#include(vs/base/common/eventEmitter): EmitterEvent, ListenerCallback, BulkListenerCallback, IEventEmitter
-// TODO@Alex: END remove this
+#include(vs/base/common/eventEmitter): EmitterEvent, BulkListenerCallback
 
 #include(vs/base/common/keyCodes): KeyCode, KeyMod
 
diff --git a/build/lib/monaco.js b/build/lib/monaco.js
index a92a6171743..cd1f3484393 100644
--- a/build/lib/monaco.js
+++ b/build/lib/monaco.js
@@ -111,13 +111,13 @@ function getNodeText(sourceFile, node) {
 }
 function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
     var result = getNodeText(sourceFile, declaration);
-    if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration) {
+    if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
         var interfaceDeclaration = declaration;
         var members = interfaceDeclaration.members;
         members.forEach(function (member) {
             try {
                 var memberText = getNodeText(sourceFile, member);
-                if (memberText.indexOf('@internal') >= 0) {
+                if (memberText.indexOf('@internal') >= 0 || memberText.indexOf('private') >= 0) {
                     // console.log('BEFORE: ', result);
                     result = result.replace(memberText, '');
                 }
diff --git a/build/lib/monaco.ts b/build/lib/monaco.ts
index 5074b76ccc6..1e36e7df519 100644
--- a/build/lib/monaco.ts
+++ b/build/lib/monaco.ts
@@ -140,14 +140,14 @@ function getNodeText(sourceFile:ts.SourceFile, node:{pos:number; end:number;}):
 
 function getMassagedTopLevelDeclarationText(sourceFile:ts.SourceFile, declaration: TSTopLevelDeclare): string {
 	let result = getNodeText(sourceFile, declaration);
-	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration) {
-		let interfaceDeclaration = <ts.InterfaceDeclaration>declaration;
+	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
+		let interfaceDeclaration = <ts.InterfaceDeclaration | ts.ClassDeclaration>declaration;
 
-		let members = interfaceDeclaration.members;
+		let members:ts.NodeArray<ts.Node> = interfaceDeclaration.members;
 		members.forEach((member) => {
 			try {
 				let memberText = getNodeText(sourceFile, member);
-				if (memberText.indexOf('@internal') >= 0) {
+				if (memberText.indexOf('@internal') >= 0 || memberText.indexOf('private') >= 0) {
 					// console.log('BEFORE: ', result);
 					result = result.replace(memberText, '');
 					// console.log('AFTER: ', result);
@@ -271,10 +271,6 @@ lines.forEach(line => {
 						return;
 					}
 				}
-				// let toExcludeArr
-				// console.log('TODO!!!');
-				// todo
-				// return (getNodeText(sourceFile, declaration).indexOf(typeName) >= 0);
 			}
 			result.push(getMassagedTopLevelDeclarationText(sourceFile, declaration));
 		});