diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts
index 2043d66da46..5a0e5f79942 100644
--- a/src/vs/base/browser/browser.ts
+++ b/src/vs/base/browser/browser.ts
@@ -21,20 +21,12 @@ interface INavigator {
 	userAgent: string;
 }
 
-interface ILocation {
-	search: string;
-}
-
 interface IGlobalScope {
-	window: ISafeWindow;
 	navigator: INavigator;
-	parent: IGlobalScope;
 	document: ISafeDocument;
 	history: {
 		pushState: any
 	};
-	isTest: boolean;
-	location: ILocation;
 }
 
 const globals = <IGlobalScope><any>(typeof self === 'object' ? self : global);
@@ -54,7 +46,6 @@ const globals = <IGlobalScope><any>(typeof self === 'object' ? self : global);
 // firefox: "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:34.0) Gecko/20100101 Firefox/34.0"
 
 const userAgent = globals.navigator ? globals.navigator.userAgent : '';
-const isTest = !!globals.isTest;
 
 // DOCUMENTED FOR FUTURE REFERENCE:
 // When running IE11 in IE10 document mode, the code below will identify the browser as being IE10,
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 727d79b8f2b..2dfd69ea5bc 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -314,7 +314,7 @@ const _animationFrame = (function() {
 
 	let isNative = !!nativeRequestAnimationFrame;
 	let request = nativeRequestAnimationFrame || emulatedRequestAnimationFrame;
-	let cancel = nativeCancelAnimationFrame || nativeCancelAnimationFrame;
+	let cancel = nativeCancelAnimationFrame || emulatedCancelAnimationFrame;
 
 	return {
 		isNative: isNative,
@@ -499,8 +499,6 @@ export function getComputedStyle(el: HTMLElement): CSSStyleDeclaration {
 // Adapted from WinJS
 // Converts a CSS positioning string for the specified element to pixels.
 const convertToPixels: (element: HTMLElement, value: string) => number = (function() {
-	let pixelsRE = /^-?\d+(\.\d+)?(px)?$/i;
-	let numberRE = /^-?\d+(\.\d+)?/i;
 	return function(element: HTMLElement, value: string): number {
 		return parseFloat(value) || 0;
 	};
@@ -943,11 +941,15 @@ export function emmet(description: string): HTMLElement {
 	}
 
 	let result = document.createElement(match[1] || 'div');
-	if (match[3]) result.id = match[3];
-	if (match[4]) result.className = match[4].replace(/\./g, ' ').trim();
+	if (match[3]) {
+		result.id = match[3];
+	}
+	if (match[4]) {
+		result.className = match[4].replace(/\./g, ' ').trim();
+	}
 
 	return result;
-};
+}
 
 export function show(...elements: HTMLElement[]): void {
 	for (const element of elements) {
diff --git a/src/vs/base/browser/htmlContentRenderer.ts b/src/vs/base/browser/htmlContentRenderer.ts
index bec84541426..269d48516a5 100644
--- a/src/vs/base/browser/htmlContentRenderer.ts
+++ b/src/vs/base/browser/htmlContentRenderer.ts
@@ -7,10 +7,10 @@
 
 import DOM = require('vs/base/browser/dom');
 import {IHTMLContentElement} from 'vs/base/common/htmlContent';
-import {TPromise} from 'vs/base/common/winjs.base';
+// import {TPromise} from 'vs/base/common/winjs.base';
 // import {WorkerClient} from 'vs/base/common/worker/workerClient';
 // import {DefaultWorkerFactory} from 'vs/base/worker/defaultWorkerFactory';
-import {marked, MarkedOptions} from 'vs/base/common/marked/marked';
+import {marked} from 'vs/base/common/marked/marked';
 
 export type RenderableContent = string | IHTMLContentElement | IHTMLContentElement[];
 
@@ -75,16 +75,16 @@ function _renderHtml(content: IHTMLContentElement, options: RenderOptions = {}):
 	if (content.markdown) {
 		const renderer = new marked.Renderer();
 		renderer.link = (href, title, text): string => {
-			return `<a href="#" data-href="${href}" title="${title || text}">${text}</a>`
-		}
+			return `<a href="#" data-href="${href}" title="${title || text}">${text}</a>`;
+		};
 		renderer.paragraph = (text): string => {
 			return `<div>${text}</div>`;
-		}
+		};
 
 		if (options.codeBlockRenderer) {
 			renderer.code = (code, lang) => {
 				return options.codeBlockRenderer(lang, code);
-			}
+			};
 		}
 
 		if (options.actionCallback) {
diff --git a/src/vs/base/browser/idleMonitor.ts b/src/vs/base/browser/idleMonitor.ts
index 04d9e12c537..6c427858062 100644
--- a/src/vs/base/browser/idleMonitor.ts
+++ b/src/vs/base/browser/idleMonitor.ts
@@ -5,8 +5,8 @@
 'use strict';
 
 import * as DomUtils from 'vs/base/browser/dom';
-import {Disposable, IDisposable, disposeAll} from 'vs/base/common/lifecycle';
-import {EventEmitter, ListenerUnbind} from 'vs/base/common/eventEmitter';
+import {Disposable, IDisposable} from 'vs/base/common/lifecycle';
+import {EventEmitter} from 'vs/base/common/eventEmitter';
 import {getService} from 'vs/base/browser/browserService';
 import {TimeoutTimer} from 'vs/base/common/async';
 
diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
index c9c34fc0a6d..5f31a0f570e 100644
--- a/src/vs/base/browser/keyboardEvent.ts
+++ b/src/vs/base/browser/keyboardEvent.ts
@@ -7,7 +7,7 @@
 
 import * as Platform from 'vs/base/common/platform';
 import * as Browser from 'vs/base/browser/browser';
-import {KeyMod, KeyCode, BinaryKeybindings} from 'vs/base/common/keyCodes';
+import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
 
 let KEY_CODE_MAP: {[keyCode:number]:KeyCode} = {};
 (function() {
@@ -163,7 +163,7 @@ let extractKeyCode = function extractKeyCode(e:KeyboardEvent): KeyCode {
 		return KeyCode.fromString(char);
 	}
 	return lookupKeyCode(e);
-}
+};
 
 export function setExtractKeyCode(newExtractKeyCode:(e:KeyboardEvent)=>KeyCode): void {
 	extractKeyCode = newExtractKeyCode;
diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index 9f5499a76f7..f104258997a 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -97,7 +97,7 @@ export interface IConnectionErrorData {
 export function transformErrorForSerialization(error: any): any {
 	if (error instanceof Error) {
 		let {name, message} = error;
-		let stack: string = (<any>error).stacktrace || (<any>error).stack
+		let stack: string = (<any>error).stacktrace || (<any>error).stack;
 		return {
 			$isError: true,
 			name,
diff --git a/src/vs/base/common/events.ts b/src/vs/base/common/events.ts
index 6694edfc593..4be4aed5377 100644
--- a/src/vs/base/common/events.ts
+++ b/src/vs/base/common/events.ts
@@ -75,5 +75,5 @@ export var EventType = {
 	CANCEL: 'cancel',
 	CHANGE: 'change',
 	DISPOSE: 'dispose',
-}
+};
 
diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts
index 2a5e06eaaab..0e3110062b1 100644
--- a/src/vs/base/common/keyCodes.ts
+++ b/src/vs/base/common/keyCodes.ts
@@ -973,5 +973,5 @@ function _asHTML(keybinding:number, labelProvider:IKeyBindingLabelProvider, Plat
 		tagName: 'span',
 		className: 'monaco-kb',
 		children: result
-	}]
+	}];
 }