diff --git a/src/vs/editor/contrib/codelens/browser/codelens.ts b/src/vs/editor/contrib/codelens/browser/codelens.ts
index ee4f98592e346c37da3318cef1d2e6ff8abb3c0f..9956057da14b4b5a571e98fee88935be0a5b9959 100644
--- a/src/vs/editor/contrib/codelens/browser/codelens.ts
+++ b/src/vs/editor/contrib/codelens/browser/codelens.ts
@@ -13,7 +13,6 @@ import Severity from 'vs/base/common/severity';
 import {format} from 'vs/base/common/strings';
 import {TPromise} from 'vs/base/common/winjs.base';
 import * as dom from 'vs/base/browser/dom';
-import {IConfigurationService} from 'vs/platform/configuration/common/configuration';
 import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
 import {IMessageService} from 'vs/platform/message/common/message';
 import {Range} from 'vs/editor/common/core/range';
@@ -340,45 +339,28 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
 
 	public static ID: string = 'css.editor.codeLens';
 
-	private static INSTANCE_COUNT: number = 0;
-
-	private _instanceCount: number;
-	private _editor: editorBrowser.ICodeEditor;
-	private _modelService: IModelService;
 	private _isEnabled: boolean;
 
 	private _globalToDispose: IDisposable[];
-
 	private _localToDispose: IDisposable[];
 	private _lenses: CodeLens[];
 	private _currentFindCodeLensSymbolsPromise: TPromise<ICodeLensData[]>;
 	private _modelChangeCounter: number;
-	private _configurationService: IConfigurationService;
-	private _keybindingService: IKeybindingService;
-	private _messageService: IMessageService;
-	private _codeLenseDisabledByMode: boolean;
-
 	private _currentFindOccPromise: TPromise<any>;
 
-	constructor(editor: editorBrowser.ICodeEditor, @IModelService modelService: IModelService,
-		@IConfigurationService configurationService: IConfigurationService,
-		@IKeybindingService keybindingService: IKeybindingService,
-		@IMessageService messageService: IMessageService) {
-
-		this._instanceCount = (++CodeLensContribution.INSTANCE_COUNT);
-		this._editor = editor;
-		this._modelService = modelService;
+	constructor(
+		private _editor: editorBrowser.ICodeEditor,
+		@IModelService private _modelService: IModelService,
+		@IKeybindingService private _keybindingService: IKeybindingService,
+		@IMessageService private _messageService: IMessageService
+	) {
 		this._isEnabled = this._editor.getConfiguration().contribInfo.referenceInfos;
-		this._configurationService = configurationService;
-		this._keybindingService = keybindingService;
-		this._messageService = messageService;
 
 		this._globalToDispose = [];
 		this._localToDispose = [];
 		this._lenses = [];
 		this._currentFindCodeLensSymbolsPromise = null;
 		this._modelChangeCounter = 0;
-		this._codeLenseDisabledByMode = true;
 
 		this._globalToDispose.push(this._editor.addListener2(editorCommon.EventType.ModelChanged, () => this.onModelChange()));
 		this._globalToDispose.push(this._editor.addListener2(editorCommon.EventType.ModelModeChanged, () => this.onModelChange()));