diff --git a/extensions/html/server/src/utils/edits.ts b/extensions/html/server/src/utils/edits.ts
index f29dd174f67..1b7b0185fe5 100644
--- a/extensions/html/server/src/utils/edits.ts
+++ b/extensions/html/server/src/utils/edits.ts
@@ -15,13 +15,10 @@ export function applyEdits(document: TextDocument, edits: TextEdit[]): string {
 		}
 		return startDiff;
 	});
-	// @ts-ignore unused local
-	let lastOffset = text.length;
 	sortedEdits.forEach(e => {
 		let startOffset = document.offsetAt(e.range.start);
 		let endOffset = document.offsetAt(e.range.end);
 		text = text.substring(0, startOffset) + e.newText + text.substring(endOffset, text.length);
-		lastOffset = startOffset;
 	});
 	return text;
 }
diff --git a/extensions/json/client/src/jsonMain.ts b/extensions/json/client/src/jsonMain.ts
index 3c9218017c9..ecbfa1e35a0 100644
--- a/extensions/json/client/src/jsonMain.ts
+++ b/extensions/json/client/src/jsonMain.ts
@@ -50,11 +50,6 @@ interface Settings {
 	};
 }
 
-// @ts-ignore unused type
-interface JSONSettings {
-	schemas: JSONSchemaSettings[];
-}
-
 interface JSONSchemaSettings {
 	fileMatch?: string[];
 	url?: string;
diff --git a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
index 3e38b7cb14a..ef5d0a5455f 100644
--- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
+++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts
@@ -11,7 +11,6 @@ import { Action } from 'vs/base/common/actions';
 import { firstIndex } from 'vs/base/common/arrays';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { IQuickOpenService, IPickOpenEntry } from 'vs/platform/quickOpen/common/quickOpen';
@@ -36,8 +35,6 @@ export class SelectColorThemeAction extends Action {
 		id: string,
 		label: string,
 		@IQuickOpenService private quickOpenService: IQuickOpenService,
-		// @ts-ignore unused injected service
-		@IMessageService private messageService: IMessageService,
 		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
 		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
 		@IViewletService private viewletService: IViewletService,
@@ -97,7 +94,6 @@ class SelectIconThemeAction extends Action {
 		id: string,
 		label: string,
 		@IQuickOpenService private quickOpenService: IQuickOpenService,
-		@IMessageService private messageService: IMessageService,
 		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
 		@IExtensionGalleryService private extensionGalleryService: IExtensionGalleryService,
 		@IViewletService private viewletService: IViewletService,
@@ -128,7 +124,6 @@ class SelectIconThemeAction extends Action {
 				}
 				this.themeService.setFileIconTheme(theme && theme.id, target).done(null,
 					err => {
-						this.messageService.show(Severity.Info, localize('problemChangingIconTheme', "Problem setting icon theme: {0}", err.message));
 						this.themeService.setFileIconTheme(currentTheme.id, null);
 					}
 				);
diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
index 197a33b6dd7..60e7a74bf39 100644
--- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts
@@ -92,8 +92,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 
 	constructor(
 		container: HTMLElement,
-		// @ts-ignore unused injected service
-		@IExtensionService private extensionService: IExtensionService,
+		@IExtensionService extensionService: IExtensionService,
 		@IStorageService private storageService: IStorageService,
 		@IBroadcastService private broadcastService: IBroadcastService,
 		@IConfigurationService private configurationService: IConfigurationService,