diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index 2df87b3fc79..99d6f0dfcca 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -6,7 +6,6 @@
 var gulp = require('gulp');
 var path = require('path');
 var _ = require('underscore');
-var buildfile = require('../src/buildfile');
 var util = require('./lib/util');
 var common = require('./gulpfile.common');
 var es = require('event-stream');
@@ -19,12 +18,18 @@ var headerVersion = semver + '(' + sha1 + ')';
 
 // Build
 
-var editorEntryPoints = _.flatten([
-	buildfile.entrypoint('vs/editor/editor.main'),
-	buildfile.base,
-	buildfile.editor,
-	buildfile.languages
-]);
+var editorEntryPoints = [
+	{
+		name: 'vs/editor/editor.main',
+		include: [],
+		exclude: [ 'vs/css', 'vs/nls' ]
+	},
+	{
+		name: 'vs/base/common/worker/simpleWorker',
+		include: [ 'vs/editor/common/services/editorSimpleWorker' ],
+		exclude: [ 'vs/css', 'vs/nls' ]
+	},
+]
 
 var editorResources = [
 	'out-build/vs/{base,editor}/**/*.{svg,png}',
@@ -32,7 +37,6 @@ var editorResources = [
 	'!out-build/vs/base/browser/ui/toolbar/**/*',
 	'!out-build/vs/base/browser/ui/octiconLabel/**/*',
 	'!out-build/vs/editor/contrib/defineKeybinding/**/*',
-	'out-build/vs/base/worker/workerMainCompatibility.html',
 	'out-build/vs/base/worker/workerMain.{js,js.map}',
 	'!out-build/vs/workbench/**',
 	'!**/test/**'
diff --git a/build/monaco/package.json b/build/monaco/package.json
index fad0832ad86..53e240b2d0b 100644
--- a/build/monaco/package.json
+++ b/build/monaco/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.7.0-next.4",
+  "version": "0.7.0-next.5",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",
diff --git a/src/vs/editor/browser/standalone/standaloneServices.ts b/src/vs/editor/browser/standalone/standaloneServices.ts
index d1fa71183ab..3d6289b98c0 100644
--- a/src/vs/editor/browser/standalone/standaloneServices.ts
+++ b/src/vs/editor/browser/standalone/standaloneServices.ts
@@ -41,8 +41,6 @@ import {
 import {ContextKeyService} from 'vs/platform/contextkey/browser/contextKeyService';
 import {IMenuService} from 'vs/platform/actions/common/actions';
 import {MenuService} from 'vs/platform/actions/common/menuService';
-import {ICompatWorkerService} from 'vs/editor/common/services/compatWorkerService';
-import {MainThreadCompatWorkerService} from 'vs/editor/common/services/compatWorkerServiceMain';
 
 export interface IEditorContextViewService extends IContextViewService {
 	dispose(): void;
@@ -137,8 +135,6 @@ export module StaticServices {
 
 	export const modelService = define(IModelService, (o) => new ModelServiceImpl(markerService.get(o), configurationService.get(o), messageService.get(o)));
 
-	export const compatWorkerService = define(ICompatWorkerService, (o) => new MainThreadCompatWorkerService(modelService.get(o)));
-
 	export const editorWorkerService = define(IEditorWorkerService, (o) => new EditorWorkerServiceImpl(modelService.get(o)));
 
 	export const codeEditorService = define(ICodeEditorService, () => new CodeEditorServiceImpl());