diff --git a/src/EditorFeatures/CSharp/AutomaticCompletion/Sessions/StringLiteralCompletionSession.cs b/src/EditorFeatures/CSharp/AutomaticCompletion/Sessions/StringLiteralCompletionSession.cs
index 7cef277caa9aee61771ca412c0ceff94a577c2ce..a0d245c016d0363d3e165d3c204739465f2d2706 100644
--- a/src/EditorFeatures/CSharp/AutomaticCompletion/Sessions/StringLiteralCompletionSession.cs
+++ b/src/EditorFeatures/CSharp/AutomaticCompletion/Sessions/StringLiteralCompletionSession.cs
@@ -5,10 +5,7 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion;
 using Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion.Sessions;
 using Microsoft.CodeAnalysis.LanguageServices;
-using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.BraceCompletion;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Text.Operations;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.AutomaticCompletion.Sessions
 {
diff --git a/src/EditorFeatures/CSharp/BlockCommentEditing/BlockCommentEditingCommandHandler.cs b/src/EditorFeatures/CSharp/BlockCommentEditing/BlockCommentEditingCommandHandler.cs
index 84096a465d7a1160e20cc611e098010ee19ef994..cc65837d4f16b79dd11e355e00bf388cc3e3c959 100644
--- a/src/EditorFeatures/CSharp/BlockCommentEditing/BlockCommentEditingCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/BlockCommentEditing/BlockCommentEditingCommandHandler.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Threading;
@@ -12,7 +11,6 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Utilities;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.BlockCommentEditing
 {
diff --git a/src/EditorFeatures/CSharp/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs b/src/EditorFeatures/CSharp/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs
index e02a5ec798ce941557d8c844208d99b60ae67e04..184b15df7d31fa0ce2e117ee4ad27d64128fad66 100644
--- a/src/EditorFeatures/CSharp/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs
+++ b/src/EditorFeatures/CSharp/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs
@@ -6,7 +6,6 @@
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.BraceMatching
 {
diff --git a/src/EditorFeatures/CSharp/Classification/CSharpEditorClassificationService.cs b/src/EditorFeatures/CSharp/Classification/CSharpEditorClassificationService.cs
index 7d8544ea207b89c72b8f832651715f844aed7385..7d2439cf88f6fc0e16de3dbe9c8e7a82f5204b04 100644
--- a/src/EditorFeatures/CSharp/Classification/CSharpEditorClassificationService.cs
+++ b/src/EditorFeatures/CSharp/Classification/CSharpEditorClassificationService.cs
@@ -6,7 +6,6 @@
 using Microsoft.CodeAnalysis.Classification;
 using Microsoft.CodeAnalysis.CSharp.Classification;
 using Microsoft.CodeAnalysis.Editor.Implementation.Classification;
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 
diff --git a/src/EditorFeatures/CSharp/CommentSelection/CSharpCommentUncommentService.cs b/src/EditorFeatures/CSharp/CommentSelection/CSharpCommentUncommentService.cs
index 5a6f5a6b29fdc950a9e83e8a73dd63c03286f75f..8cb6870c1e7a4bd0db4fbb74a4f402b7a1402f0a 100644
--- a/src/EditorFeatures/CSharp/CommentSelection/CSharpCommentUncommentService.cs
+++ b/src/EditorFeatures/CSharp/CommentSelection/CSharpCommentUncommentService.cs
@@ -1,10 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.ComponentModel.Composition;
 using System.Composition;
-using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection;
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.CommentSelection
diff --git a/src/EditorFeatures/CSharp/DocumentationComments/XmlTagCompletionCommandHandler.cs b/src/EditorFeatures/CSharp/DocumentationComments/XmlTagCompletionCommandHandler.cs
index 7cee5728d94cc8a4cf0d0402ba1d9c3888d7b612..c465c988732e25acd3f04e44bde4df372ded01bb 100644
--- a/src/EditorFeatures/CSharp/DocumentationComments/XmlTagCompletionCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/DocumentationComments/XmlTagCompletionCommandHandler.cs
@@ -12,7 +12,6 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Utilities;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.DocumentationComments
 {
diff --git a/src/EditorFeatures/CSharp/EndConstruct/CSharpEndConstructGenerationService.cs b/src/EditorFeatures/CSharp/EndConstruct/CSharpEndConstructGenerationService.cs
index 7344e67bc1dbf41dc6e79ee80c5ba500cb3b3795..fdd86e5e8b8687fed38d03ab30d76f501147f451 100644
--- a/src/EditorFeatures/CSharp/EndConstruct/CSharpEndConstructGenerationService.cs
+++ b/src/EditorFeatures/CSharp/EndConstruct/CSharpEndConstructGenerationService.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using Microsoft.CodeAnalysis.Editor.Implementation.EndConstructGeneration;
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
diff --git a/src/EditorFeatures/CSharp/EventHookup/EventHookupCommandHandler.cs b/src/EditorFeatures/CSharp/EventHookup/EventHookupCommandHandler.cs
index 7a2445a5e63b7670862059dc62826b1606c3d560..83883c8c41ee08ca589f1a980ff86994c20d31e4 100644
--- a/src/EditorFeatures/CSharp/EventHookup/EventHookupCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/EventHookup/EventHookupCommandHandler.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Threading;
-using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.VisualStudio.Language.Intellisense;
diff --git a/src/EditorFeatures/CSharp/EventHookup/EventHookupQuickInfoSource.cs b/src/EditorFeatures/CSharp/EventHookup/EventHookupQuickInfoSource.cs
index bb8585fee642a6636b7078b5ca551a73810b01e5..568916acedb19d06a6bc31bfadb5a3d83e914071 100644
--- a/src/EditorFeatures/CSharp/EventHookup/EventHookupQuickInfoSource.cs
+++ b/src/EditorFeatures/CSharp/EventHookup/EventHookupQuickInfoSource.cs
@@ -10,7 +10,6 @@
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.EventHookup
 {
diff --git a/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager_EventHookupSession.cs b/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager_EventHookupSession.cs
index 78c75208c026a6607e7bdf6855055683d42be9e1..2cbf724c075a6cc8f1b088771baedd0e8814de82 100644
--- a/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager_EventHookupSession.cs
+++ b/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager_EventHookupSession.cs
@@ -5,7 +5,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
diff --git a/src/EditorFeatures/CSharp/Formatting/CSharpEditorFormattingService.PasteFormattingRule.cs b/src/EditorFeatures/CSharp/Formatting/CSharpEditorFormattingService.PasteFormattingRule.cs
index 734b48d6d355f29a8d891da5d03ff8f21861ce7a..28187fe24dd0a9c4c96295fe1c9ce2eefebff720 100644
--- a/src/EditorFeatures/CSharp/Formatting/CSharpEditorFormattingService.PasteFormattingRule.cs
+++ b/src/EditorFeatures/CSharp/Formatting/CSharpEditorFormattingService.PasteFormattingRule.cs
@@ -1,10 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Formatting.Rules;
 using Microsoft.CodeAnalysis.Options;
diff --git a/src/EditorFeatures/CSharp/Formatting/Indentation/CSharpIndentationService.cs b/src/EditorFeatures/CSharp/Formatting/Indentation/CSharpIndentationService.cs
index e6ed5763de30e3b52b19d6c2082fb0e2a222b31c..0c6daf061c3cc4b14cfd87f73a7b242a2f5986fb 100644
--- a/src/EditorFeatures/CSharp/Formatting/Indentation/CSharpIndentationService.cs
+++ b/src/EditorFeatures/CSharp/Formatting/Indentation/CSharpIndentationService.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Composition;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Formatting/Indentation/SmartTokenFormatterCommandHandler.cs b/src/EditorFeatures/CSharp/Formatting/Indentation/SmartTokenFormatterCommandHandler.cs
index b13563e635f5dd2095cd20fc58b7bd2c673db7d5..00844252c9fe593284915d85a011def0c6fa9074 100644
--- a/src/EditorFeatures/CSharp/Formatting/Indentation/SmartTokenFormatterCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/Formatting/Indentation/SmartTokenFormatterCommandHandler.cs
@@ -11,7 +11,6 @@
 using Microsoft.CodeAnalysis.Formatting.Rules;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Utilities;
 using Roslyn.Utilities;
diff --git a/src/EditorFeatures/CSharp/Formatting/Indentation/WhitespaceExtensions.cs b/src/EditorFeatures/CSharp/Formatting/Indentation/WhitespaceExtensions.cs
index 4a620b5c6041f64d1b1aa43c245ecf0da509dcfe..d27e4791b93c5880d2e222ea8b516b322467d428 100644
--- a/src/EditorFeatures/CSharp/Formatting/Indentation/WhitespaceExtensions.cs
+++ b/src/EditorFeatures/CSharp/Formatting/Indentation/WhitespaceExtensions.cs
@@ -1,8 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Editor.Implementation.Formatting.Indentation;
-using Microsoft.VisualStudio.Text;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Formatting.Indentation
 {
diff --git a/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs
index 18268bc418be38ec67358c88828aa9005ab8f4dc..8dd47c6be1e497a37eff98214b521e0c33972c16 100644
--- a/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs
+++ b/src/EditorFeatures/CSharp/GoToDefinition/CSharpGoToDefinitionService.cs
@@ -3,13 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Composition;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Implementation.GoToDefinition;
-using Microsoft.CodeAnalysis.Editor.Navigation;
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.GoToDefinition
diff --git a/src/EditorFeatures/CSharp/GoToImplementation/CSharpGoToImplementationService.cs b/src/EditorFeatures/CSharp/GoToImplementation/CSharpGoToImplementationService.cs
index 1deb7fbfe2ef8b8f212e9c273c64298462fb752f..bc30c342b923a5f9ea48d29b48925931def8cd04 100644
--- a/src/EditorFeatures/CSharp/GoToImplementation/CSharpGoToImplementationService.cs
+++ b/src/EditorFeatures/CSharp/GoToImplementation/CSharpGoToImplementationService.cs
@@ -3,9 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Composition;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Implementation.GoToImplementation;
 using Microsoft.CodeAnalysis.Host.Mef;
diff --git a/src/EditorFeatures/CSharp/HighlightReferences/CSharpDocumentHighlightsService.cs b/src/EditorFeatures/CSharp/HighlightReferences/CSharpDocumentHighlightsService.cs
index 0934264d74330197555fadb2d764f000309649cc..c1f3baf669ed04f29b150e4541d5ad55fb89677f 100644
--- a/src/EditorFeatures/CSharp/HighlightReferences/CSharpDocumentHighlightsService.cs
+++ b/src/EditorFeatures/CSharp/HighlightReferences/CSharpDocumentHighlightsService.cs
@@ -2,7 +2,6 @@
 
 using System.Composition;
 using Microsoft.CodeAnalysis.Editor.Implementation.ReferenceHighlighting;
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.HighlightReferences
diff --git a/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/AwaitHighlighter.cs b/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/AwaitHighlighter.cs
index 0db312fe59c1a4b157613eb3ba47134d20a8c218..0a44d772e83f46190a6a9f9e09ff769656e4a2ff 100644
--- a/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/AwaitHighlighter.cs
+++ b/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/AwaitHighlighter.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
diff --git a/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs b/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs
index 670e9a1849674465064aa2c317a898842f0de93b..d6f93e08ca3cc172bdb1f313a9a2763bf30d27de 100644
--- a/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs
+++ b/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/ReturnStatementHighlighter.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
diff --git a/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs b/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs
index 2f3fed530a5c90f3abc314f3a73c0cfb70f61ab0..a7dcc02b76f245a25e3ffc03e7083df5b29668b1 100644
--- a/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs
+++ b/src/EditorFeatures/CSharp/Highlighting/KeywordHighlighters/YieldStatementHighlighter.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Implementation.Highlighting;
diff --git a/src/EditorFeatures/CSharp/InlineRename/CSharpEditorInlineRenameService.cs b/src/EditorFeatures/CSharp/InlineRename/CSharpEditorInlineRenameService.cs
index 2786b27e52ae7bdfac762b1bfcd8072650fb12e0..c025c1e04c38a4129145c58ddae4c99eb062589e 100644
--- a/src/EditorFeatures/CSharp/InlineRename/CSharpEditorInlineRenameService.cs
+++ b/src/EditorFeatures/CSharp/InlineRename/CSharpEditorInlineRenameService.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Composition;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Implementation.InlineRename;
 using Microsoft.CodeAnalysis.Host.Mef;
 
diff --git a/src/EditorFeatures/CSharp/LanguageServices/CSharpContentTypeLanguageService.cs b/src/EditorFeatures/CSharp/LanguageServices/CSharpContentTypeLanguageService.cs
index ca1ab42ba00230999f5712e37a283b9d4cee82d7..d85f28b4fb21a3e4f6e87ef14ad2e80e30fb725a 100644
--- a/src/EditorFeatures/CSharp/LanguageServices/CSharpContentTypeLanguageService.cs
+++ b/src/EditorFeatures/CSharp/LanguageServices/CSharpContentTypeLanguageService.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Composition;
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.LanguageServices
diff --git a/src/EditorFeatures/CSharp/NavigationBar/CSharpNavigationBarItemService.cs b/src/EditorFeatures/CSharp/NavigationBar/CSharpNavigationBarItemService.cs
index 886e7fb3c0337e33250c70dab53dbc8202e289ae..56fb1e8368e0dd6b8f611ef1ae3cd41da19bf116 100644
--- a/src/EditorFeatures/CSharp/NavigationBar/CSharpNavigationBarItemService.cs
+++ b/src/EditorFeatures/CSharp/NavigationBar/CSharpNavigationBarItemService.cs
@@ -1,25 +1,19 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
 using System.Composition;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Symbols;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Extensibility.NavigationBar;
 using Microsoft.CodeAnalysis.Editor.Implementation.NavigationBar;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Roslyn.Utilities;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/CompilationUnitOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/CompilationUnitOutliner.cs
index 67f0b98a7ed50a14bbbed7b553e8fe86b2432be3..d3e7b806b0b0574b06aa55e39c851c314b323d0d 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/CompilationUnitOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/CompilationUnitOutliner.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Implementation.Outlining;
 
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/DisabledTextTriviaOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/DisabledTextTriviaOutliner.cs
index 773bb62a653e9846b159e736c614b3600bbf7ecf..41494b10994fa7442cb787fbd298ea20f1ca2246 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/DisabledTextTriviaOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/DisabledTextTriviaOutliner.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Editor.Implementation.Outlining;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/DocumentationCommentOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/DocumentationCommentOutliner.cs
index 913de1f579536aff901b07a6b5ae767f2f36750d..4ccf7f15e533a67456a22ea3c151d39b057c8476 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/DocumentationCommentOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/DocumentationCommentOutliner.cs
@@ -8,7 +8,6 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Implementation.Outlining;
-using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/EventDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/EventDeclarationOutliner.cs
index 28e8b1cb89e630061803893cc2e893880a6483f0..0c5f5e39d00cddb34d804259e00c939608688c84 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/EventDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/EventDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/EventFieldDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/EventFieldDeclarationOutliner.cs
index a711edd60e397f148ff71be56c296c2993f30e23..c0ece232d5f48cf570c1c59a413d03fe6054ffc4 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/EventFieldDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/EventFieldDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/FieldDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/FieldDeclarationOutliner.cs
index a9249fdeac5cfab1f689b47f4b6ae36951a25e5d..7ca03b8a6bf0cea75c663d269752d270a113eb90 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/FieldDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/FieldDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/IndexerDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/IndexerDeclarationOutliner.cs
index 4b4332818cafd119ccc42c5585b717b60b04a014..98430c58034cb0fbec48c43205b8580099456c28 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/IndexerDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/IndexerDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConstructorDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConstructorDeclarationOutliner.cs
index 02e73e598d36db298bfc6e254a8d4026aa45c3e8..46afb8c468de99b3a354a228336511fa3faec94d 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConstructorDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConstructorDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConversionOperatorDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConversionOperatorDeclarationOutliner.cs
index 0b61422668b1df9684e02a5ca350b8a23f2d5d6d..50ece7e7833924924e228691a4b9efcfa4914a8d 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConversionOperatorDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/ConversionOperatorDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DelegateDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DelegateDeclarationOutliner.cs
index fb875f32964dad708abbdd33e96efd1935136fb4..fc0e7932ebf541abac575f71bb76bec62e1cd378 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DelegateDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DelegateDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DestructorDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DestructorDeclarationOutliner.cs
index 02c7c9fe8039a889c57af3311117779734c1d7eb..19e87248d068a848c9167526cfbeb6409ce7d3a1 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DestructorDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/DestructorDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumDeclarationOutliner.cs
index 4888fa29a1a69097be0067cacdca50ae2fb1408e..d7020fb2fcce1e7c24e42dae6d1b8248446d167f 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumMemberDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumMemberDeclarationOutliner.cs
index 2672b10f6cdb5c83f9ba662c9780538b66171260..231a08f4dce5371c6b7976d16e70384a820f99d0 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumMemberDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EnumMemberDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventDeclarationOutliner.cs
index c0537588238316891f8662ce490523e48e4b5cf5..abb799f822935fa0703adadf731becb82cbee2db 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventFieldDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventFieldDeclarationOutliner.cs
index 70690dc033dc51144552537d5f4447da767ed8e7..1fb2f42d867fccb420b45f8cb10255419a5e1207 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventFieldDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/EventFieldDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/FieldDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/FieldDeclarationOutliner.cs
index 206e94183dfea74ca5243adc6a698f86b9a4cae6..ff27cbdef00353772b4a1a55d20a9009a04e32dc 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/FieldDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/FieldDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/IndexerDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/IndexerDeclarationOutliner.cs
index 986664824ebd0ea40dd2a4d6d3532e9ec1aded68..207ef357e511a56750d5217f626b4fcbf5f50fbe 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/IndexerDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/IndexerDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/MethodDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/MethodDeclarationOutliner.cs
index 7259daf0b0bc6ad698ff7d50859d7fc53b026d5c..bd9af1053329a1a5f491033cc8bcfd56f436f5c0 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/MethodDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/MethodDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/PropertyDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/PropertyDeclarationOutliner.cs
index 3b05b0ace313a6c946711c0f92fcc6a4813c7f23..bc0cc51be5cc1ec1eaee0083dd8be30a2322b312 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/PropertyDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/PropertyDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/TypeDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/TypeDeclarationOutliner.cs
index 633753f687c519055bfad73ad7f3acb86687ff14..375a8b649bb59a12f96d23634f16223354ad5c7a 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/TypeDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MetadataAsSource/TypeDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.Outlining.MetadataAsSource
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/MethodDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/MethodDeclarationOutliner.cs
index fa307bc88797886fb0f8c64ec8f77894f9418bd7..8432b1278068e8e7c763860993de77e79816643f 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/MethodDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/MethodDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/NamespaceDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/NamespaceDeclarationOutliner.cs
index 8055ff327851347084390b84f063f737168e158d..9b204611001bfd7a78a009f5346af27ba2fbe118 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/NamespaceDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/NamespaceDeclarationOutliner.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editor.Implementation.Outlining;
 
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/OperatorDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/OperatorDeclarationOutliner.cs
index 781659ec49ec9c6c6e2d208294a90a997a42230d..aaca26df76afaa1475efc2abd7e29fc7e9291c6c 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/OperatorDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/OperatorDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/ParenthesizedLambdaExpressionOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/ParenthesizedLambdaExpressionOutliner.cs
index f3d79bd2e2fa013438c28950ea295ed688c548bb..ce1b33a69dff21f5136198d1ecff2af56e352bd4 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/ParenthesizedLambdaExpressionOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/ParenthesizedLambdaExpressionOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/PropertyDeclarationOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/PropertyDeclarationOutliner.cs
index 39b2bc10b64cae2c599906ea0a2c254ae3744576..efd1447df70d11a81fb153ab322e849c35c4781a 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/PropertyDeclarationOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/PropertyDeclarationOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/RegionDirectiveOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/RegionDirectiveOutliner.cs
index 65099bbb3adc75e51cd3a69cd764ffe95e6204ac..e9a67a127cf7dc5972ce6e7efb312e9a3a55b2c7 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/RegionDirectiveOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/RegionDirectiveOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
diff --git a/src/EditorFeatures/CSharp/Outlining/Outliners/SimpleLambdaExpressionOutliner.cs b/src/EditorFeatures/CSharp/Outlining/Outliners/SimpleLambdaExpressionOutliner.cs
index 82c60c67b08ae6b8a13cdbbbb60235f66a24dae2..1b5414d50f125144ef6349ae4de522bb2f41c691 100644
--- a/src/EditorFeatures/CSharp/Outlining/Outliners/SimpleLambdaExpressionOutliner.cs
+++ b/src/EditorFeatures/CSharp/Outlining/Outliners/SimpleLambdaExpressionOutliner.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
diff --git a/src/EditorFeatures/CSharp/QuickInfo/SemanticQuickInfoProvider.cs b/src/EditorFeatures/CSharp/QuickInfo/SemanticQuickInfoProvider.cs
index 39a8da797a9995656b959b84b84b0dc66a9ce5a3..08ff532525cba83c4e3fb9d945bdd2a33fa4ce42 100644
--- a/src/EditorFeatures/CSharp/QuickInfo/SemanticQuickInfoProvider.cs
+++ b/src/EditorFeatures/CSharp/QuickInfo/SemanticQuickInfoProvider.cs
@@ -5,10 +5,8 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.QuickInfo;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.VisualStudio.Language.Intellisense;
-using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
-using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.QuickInfo
 {
@@ -17,15 +15,13 @@ internal class SemanticQuickInfoProvider : AbstractSemanticQuickInfoProvider
     {
         [ImportingConstructor]
         public SemanticQuickInfoProvider(
-            ITextBufferFactoryService textBufferFactoryService,
-            IContentTypeRegistryService contentTypeRegistryService,
             IProjectionBufferFactoryService projectionBufferFactoryService,
             IEditorOptionsFactoryService editorOptionsFactoryService,
             ITextEditorFactoryService textEditorFactoryService,
             IGlyphService glyphService,
             ClassificationTypeMap typeMap)
-            : base(textBufferFactoryService, contentTypeRegistryService, projectionBufferFactoryService,
-                   editorOptionsFactoryService, textEditorFactoryService, glyphService, typeMap)
+            : base(projectionBufferFactoryService, editorOptionsFactoryService,
+                   textEditorFactoryService, glyphService, typeMap)
         {
         }
 
diff --git a/src/EditorFeatures/CSharp/QuickInfo/SyntacticQuickInfoProvider.cs b/src/EditorFeatures/CSharp/QuickInfo/SyntacticQuickInfoProvider.cs
index 66f2f901b2261329c7082faf64ab63e48a8594a8..142befb4b732ee447d1998e7b691824f3ef2aedc 100644
--- a/src/EditorFeatures/CSharp/QuickInfo/SyntacticQuickInfoProvider.cs
+++ b/src/EditorFeatures/CSharp/QuickInfo/SyntacticQuickInfoProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Linq;
@@ -15,7 +14,6 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
-using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.QuickInfo
 {
@@ -24,15 +22,13 @@ internal class SyntacticQuickInfoProvider : AbstractQuickInfoProvider
     {
         [ImportingConstructor]
         public SyntacticQuickInfoProvider(
-            ITextBufferFactoryService textBufferFactoryService,
-            IContentTypeRegistryService contentTypeRegistryService,
             IProjectionBufferFactoryService projectionBufferFactoryService,
             IEditorOptionsFactoryService editorOptionsFactoryService,
             ITextEditorFactoryService textEditorFactoryService,
             IGlyphService glyphService,
             ClassificationTypeMap typeMap)
-            : base(textBufferFactoryService, contentTypeRegistryService, projectionBufferFactoryService,
-                   editorOptionsFactoryService, textEditorFactoryService, glyphService, typeMap)
+            : base(projectionBufferFactoryService, editorOptionsFactoryService,
+                   textEditorFactoryService, glyphService, typeMap)
         {
         }
 
diff --git a/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.StringSplitter.cs b/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.StringSplitter.cs
index 0e3ac9eb2f124a9aa44977900ce0a1cb1d576fd7..9ae4fb36a472618dd1d5ce8b29173b2c862751d4 100644
--- a/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.StringSplitter.cs
+++ b/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.StringSplitter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
diff --git a/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs b/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs
index 21a1df4d1e1f5275776fecd8943f9a36bf2729c6..da2cd362725ae2a2a79f14b50f391c6e0a6ed128 100644
--- a/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs
+++ b/src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Commands;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Formatting;
diff --git a/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyAnalyzer.cs b/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyAnalyzer.cs
index 2e37d861863bde11f88476dc161ddea18add8971..6759a864e0cc3c912b384d4965b611c52bfd8d5a 100644
--- a/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyAnalyzer.cs
+++ b/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyAnalyzer.cs
@@ -2,13 +2,11 @@
 
 using System.Collections.Concurrent;
 using System.ComponentModel.Composition;
-using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.UseAutoProperty;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.CSharp.UseAutoProperty
 {
diff --git a/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyCodeFixProvider.cs b/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyCodeFixProvider.cs
index 021872630f9ccb988288c103da838e0059679b5c..3969ed1cc54b5108b3043202022b22f48d56613c 100644
--- a/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyCodeFixProvider.cs
+++ b/src/EditorFeatures/CSharp/UseAutoProperty/UseAutoPropertyCodeFixProvider.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Composition;
 using System.Linq;
diff --git a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs
index 110bea9b95b2f3dc9416761d397168d45e91372f..2e1f6f0c0918bd9fcb7205b52dbb775bc806c046 100644
--- a/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs
+++ b/src/EditorFeatures/CSharpTest/QuickInfo/SemanticQuickInfoSourceTests.cs
@@ -40,8 +40,6 @@ private async Task TestWithOptionsAsync(TestWorkspace workspace, params Action<o
             var document = workspace.CurrentSolution.GetDocument(documentId);
 
             var provider = new SemanticQuickInfoProvider(
-                workspace.GetService<ITextBufferFactoryService>(),
-                workspace.GetService<IContentTypeRegistryService>(),
                 workspace.GetService<IProjectionBufferFactoryService>(),
                 workspace.GetService<IEditorOptionsFactoryService>(),
                 workspace.GetService<ITextEditorFactoryService>(),
@@ -106,8 +104,6 @@ private async Task VerifyWithMscorlib45Async(string markup, Action<object>[] exp
                 var document = workspace.CurrentSolution.GetDocument(documentId);
 
                 var provider = new SemanticQuickInfoProvider(
-                        workspace.GetService<ITextBufferFactoryService>(),
-                        workspace.GetService<IContentTypeRegistryService>(),
                         workspace.GetService<IProjectionBufferFactoryService>(),
                         workspace.GetService<IEditorOptionsFactoryService>(),
                         workspace.GetService<ITextEditorFactoryService>(),
@@ -263,8 +259,6 @@ private async Task VerifyWithReferenceWorkerAsync(string xmlString, params Actio
                 var document = workspace.CurrentSolution.GetDocument(documentId);
 
                 var provider = new SemanticQuickInfoProvider(
-                        workspace.GetService<ITextBufferFactoryService>(),
-                        workspace.GetService<IContentTypeRegistryService>(),
                         workspace.GetService<IProjectionBufferFactoryService>(),
                         workspace.GetService<IEditorOptionsFactoryService>(),
                         workspace.GetService<ITextEditorFactoryService>(),
diff --git a/src/EditorFeatures/CSharpTest/QuickInfo/SyntacticQuickInfoSourceTests.cs b/src/EditorFeatures/CSharpTest/QuickInfo/SyntacticQuickInfoSourceTests.cs
index e54ee7233416d70455a4f117ce02d88889757501..72007fd5adbfbdd69ba39b4ab1e8fbfd7fca2aee 100644
--- a/src/EditorFeatures/CSharpTest/QuickInfo/SyntacticQuickInfoSourceTests.cs
+++ b/src/EditorFeatures/CSharpTest/QuickInfo/SyntacticQuickInfoSourceTests.cs
@@ -277,8 +277,6 @@ public async Task ScopeBrackets_10()
         private IQuickInfoProvider CreateProvider(TestWorkspace workspace)
         {
             return new SyntacticQuickInfoProvider(
-                workspace.GetService<ITextBufferFactoryService>(),
-                workspace.GetService<IContentTypeRegistryService>(),
                 workspace.GetService<IProjectionBufferFactoryService>(),
                 workspace.GetService<IEditorOptionsFactoryService>(),
                 workspace.GetService<ITextEditorFactoryService>(),
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/DeferredContent/ClassifiableDeferredContent.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/DeferredContent/ClassifiableDeferredContent.cs
index 7f608f6596163a9c136989b93a6bb7ffe2bc6ad5..3ca282931904736cb6af34d0f1562a5357114773 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/DeferredContent/ClassifiableDeferredContent.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/DeferredContent/ClassifiableDeferredContent.cs
@@ -4,8 +4,6 @@
 using System.Windows;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
-using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.QuickInfo
 {
@@ -13,19 +11,13 @@ internal class ClassifiableDeferredContent : IDeferredQuickInfoContent
     {
         // Internal for testing purposes.
         internal readonly IList<SymbolDisplayPart> ClassifiableContent;
-        private readonly ITextBufferFactoryService _textBufferFactoryService;
-        private readonly IContentTypeRegistryService _contentTypeRegistryService;
         private readonly ClassificationTypeMap _typeMap;
 
         public ClassifiableDeferredContent(
             IList<SymbolDisplayPart> content,
-            ITextBufferFactoryService textBufferFactoryService,
-            IContentTypeRegistryService contentTypeRegistryService,
             ClassificationTypeMap typeMap)
         {
             this.ClassifiableContent = content;
-            _textBufferFactoryService = textBufferFactoryService;
-            _contentTypeRegistryService = contentTypeRegistryService;
             _typeMap = typeMap;
         }
 
@@ -41,4 +33,4 @@ public virtual FrameworkElement Create()
             return classifiedTextBlock;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractQuickInfoProvider.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractQuickInfoProvider.cs
index c4de295f575fffdebc3318e8f0c2cdfd5f0d6836..a85a61baa80bad47291bc5de3d51ba7f8e373745 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractQuickInfoProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractQuickInfoProvider.cs
@@ -9,14 +9,11 @@
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Projection;
-using Microsoft.VisualStudio.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.QuickInfo
 {
     internal abstract partial class AbstractQuickInfoProvider : IQuickInfoProvider
     {
-        private readonly ITextBufferFactoryService _textBufferFactoryService;
-        private readonly IContentTypeRegistryService _contentTypeRegistryService;
         private readonly IProjectionBufferFactoryService _projectionBufferFactoryService;
         private readonly IEditorOptionsFactoryService _editorOptionsFactoryService;
         private readonly ITextEditorFactoryService _textEditorFactoryService;
@@ -24,16 +21,12 @@ internal abstract partial class AbstractQuickInfoProvider : IQuickInfoProvider
         private readonly ClassificationTypeMap _typeMap;
 
         protected AbstractQuickInfoProvider(
-            ITextBufferFactoryService textBufferFactoryService,
-            IContentTypeRegistryService contentTypeRegistryService,
             IProjectionBufferFactoryService projectionBufferFactoryService,
             IEditorOptionsFactoryService editorOptionsFactoryService,
             ITextEditorFactoryService textEditorFactoryService,
             IGlyphService glyphService,
             ClassificationTypeMap typeMap)
         {
-            _textBufferFactoryService = textBufferFactoryService;
-            _contentTypeRegistryService = contentTypeRegistryService;
             _projectionBufferFactoryService = projectionBufferFactoryService;
             _editorOptionsFactoryService = editorOptionsFactoryService;
             _textEditorFactoryService = textEditorFactoryService;
@@ -148,8 +141,7 @@ protected IDeferredQuickInfoContent CreateGlyphDeferredContent(ISymbol symbol)
 
         protected IDeferredQuickInfoContent CreateClassifiableDeferredContent(IList<SymbolDisplayPart> content)
         {
-            return new ClassifiableDeferredContent(
-                content, _textBufferFactoryService, _contentTypeRegistryService, _typeMap);
+            return new ClassifiableDeferredContent(content, _typeMap);
         }
 
         protected IDeferredQuickInfoContent CreateDocumentationCommentDeferredContent(
diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractSemanticQuickInfoProvider.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractSemanticQuickInfoProvider.cs
index 784861d78ca00459e4994db7859576f0ff7f9358..274ad18efd5c6803970fe62e5f6607b7600baf01 100644
--- a/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractSemanticQuickInfoProvider.cs
+++ b/src/EditorFeatures/Core/Implementation/IntelliSense/QuickInfo/Providers/AbstractSemanticQuickInfoProvider.cs
@@ -23,15 +23,13 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.QuickInfo
     internal abstract partial class AbstractSemanticQuickInfoProvider : AbstractQuickInfoProvider
     {
         public AbstractSemanticQuickInfoProvider(
-            ITextBufferFactoryService textBufferFactoryService,
-            IContentTypeRegistryService contentTypeRegistryService,
             IProjectionBufferFactoryService projectionBufferFactoryService,
             IEditorOptionsFactoryService editorOptionsFactoryService,
             ITextEditorFactoryService textEditorFactoryService,
             IGlyphService glyphService,
             ClassificationTypeMap typeMap)
-            : base(textBufferFactoryService, contentTypeRegistryService, projectionBufferFactoryService,
-                   editorOptionsFactoryService, textEditorFactoryService, glyphService, typeMap)
+            : base(projectionBufferFactoryService, editorOptionsFactoryService,
+                   textEditorFactoryService, glyphService, typeMap)
         {
         }
 
diff --git a/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/LessAndGreaterThanCompletionSession.vb b/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/LessAndGreaterThanCompletionSession.vb
index c95e835b3a2889fe6b882712296a65909472350d..79edb468eed50011169a899a93fb68aca67a54b6 100644
--- a/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/LessAndGreaterThanCompletionSession.vb
+++ b/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/LessAndGreaterThanCompletionSession.vb
@@ -2,11 +2,8 @@
 
 Imports Microsoft.CodeAnalysis.LanguageServices
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports Microsoft.VisualStudio.Text.Editor
-Imports Microsoft.VisualStudio.Text.Operations
 Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion
 Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion.Sessions
-Imports Microsoft.VisualStudio.Text
 Imports System.Threading
 Imports Microsoft.VisualStudio.Text.BraceCompletion
 
diff --git a/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/ParenthesisCompletionSession.vb b/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/ParenthesisCompletionSession.vb
index 65f58a45a4872a3f586f9ef151fa63b151b70fa1..f4065f78b8ecef297c84960c0b92bb8961574359 100644
--- a/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/ParenthesisCompletionSession.vb
+++ b/src/EditorFeatures/VisualBasic/AutomaticCompletion/Sessions/ParenthesisCompletionSession.vb
@@ -2,11 +2,8 @@
 
 Imports Microsoft.CodeAnalysis.LanguageServices
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports Microsoft.VisualStudio.Text.Editor
-Imports Microsoft.VisualStudio.Text.Operations
 Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion
 Imports Microsoft.CodeAnalysis.Editor.Implementation.AutomaticCompletion.Sessions
-Imports Microsoft.VisualStudio.Text
 Imports System.Threading
 Imports Microsoft.VisualStudio.Text.BraceCompletion
 
diff --git a/src/EditorFeatures/VisualBasic/Classification/VisualBasicEditorClassificationService.vb b/src/EditorFeatures/VisualBasic/Classification/VisualBasicEditorClassificationService.vb
index ee864a397c974997398d429ea7ea6f84b6d72f50..3baa42c6b82ce78f5fa053ca17a5764defbdc18c 100644
--- a/src/EditorFeatures/VisualBasic/Classification/VisualBasicEditorClassificationService.vb
+++ b/src/EditorFeatures/VisualBasic/Classification/VisualBasicEditorClassificationService.vb
@@ -4,7 +4,6 @@ Imports System.Composition
 Imports System.Threading
 Imports Microsoft.CodeAnalysis.Classification
 Imports Microsoft.CodeAnalysis.Editor.Implementation.Classification
-Imports Microsoft.CodeAnalysis.Host
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic.Classification
diff --git a/src/EditorFeatures/VisualBasic/CommentSelection/VisualBasicCommentUncommentService.vb b/src/EditorFeatures/VisualBasic/CommentSelection/VisualBasicCommentUncommentService.vb
index 95d1b95d7a50a1b7b346fcd13d23d7dfb5fb9466..ac1bc4e7e0b7cdc78f5c835ccbd24daf08ecd29b 100644
--- a/src/EditorFeatures/VisualBasic/CommentSelection/VisualBasicCommentUncommentService.vb
+++ b/src/EditorFeatures/VisualBasic/CommentSelection/VisualBasicCommentUncommentService.vb
@@ -1,9 +1,7 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports System.Composition
-Imports Microsoft.CodeAnalysis.Editor.Host
 Imports Microsoft.CodeAnalysis.Editor.Implementation.CommentSelection
-Imports Microsoft.CodeAnalysis.Host
 Imports Microsoft.CodeAnalysis.Host.Mef
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.CommentSelection
diff --git a/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_CustomEvents.vb b/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_CustomEvents.vb
index 7f4031fb657ed3283f14dbc7f20f008872045b67..e3cd1dc0fe62361ab53aad73357427774a332ceb 100644
--- a/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_CustomEvents.vb
+++ b/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_CustomEvents.vb
@@ -1,6 +1,5 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.EndConstructGeneration
diff --git a/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_LambdaHeader.vb b/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_LambdaHeader.vb
index 7694ce9ed0e594de6e52cbe41d013fc26396a53e..6b3a69f6f0c1c3430427bd625fd044dd91c8145b 100644
--- a/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_LambdaHeader.vb
+++ b/src/EditorFeatures/VisualBasic/EndConstructGeneration/EndConstructStatementVisitor_LambdaHeader.vb
@@ -1,7 +1,6 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports Microsoft.CodeAnalysis
-Imports Microsoft.CodeAnalysis.Formatting
 Imports Microsoft.CodeAnalysis.Text.Shared.Extensions
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
diff --git a/src/EditorFeatures/VisualBasic/Formatting/Indentation/SmartTokenFormatterCommandHandler.vb b/src/EditorFeatures/VisualBasic/Formatting/Indentation/SmartTokenFormatterCommandHandler.vb
index 45c34f0c57df2e0896d25385c780140ac219839e..a24ab27ab70cc1ddba4a2725ac72f04a072aa099 100644
--- a/src/EditorFeatures/VisualBasic/Formatting/Indentation/SmartTokenFormatterCommandHandler.vb
+++ b/src/EditorFeatures/VisualBasic/Formatting/Indentation/SmartTokenFormatterCommandHandler.vb
@@ -8,8 +8,6 @@ Imports Microsoft.CodeAnalysis.Formatting.Rules
 Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports Microsoft.VisualStudio.Text
-Imports Microsoft.VisualStudio.Text.Editor
 Imports Microsoft.VisualStudio.Text.Operations
 Imports Microsoft.VisualStudio.Utilities
 
diff --git a/src/EditorFeatures/VisualBasic/Formatting/Indentation/VisualBasicIndentationService.vb b/src/EditorFeatures/VisualBasic/Formatting/Indentation/VisualBasicIndentationService.vb
index 47664c9d4fc697a4d1d316dd0e1848c32b870ecf..a4371831677df3e7b91b586e99a3d3b60c28d2a9 100644
--- a/src/EditorFeatures/VisualBasic/Formatting/Indentation/VisualBasicIndentationService.vb
+++ b/src/EditorFeatures/VisualBasic/Formatting/Indentation/VisualBasicIndentationService.vb
@@ -4,14 +4,12 @@ Imports System.Composition
 Imports System.Threading
 Imports Microsoft.CodeAnalysis.Editor.Implementation.SmartIndent
 Imports Microsoft.CodeAnalysis.Formatting.Rules
-Imports Microsoft.CodeAnalysis.Host
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.LanguageServices
 Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.Text.Shared.Extensions
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports Microsoft.VisualStudio.Text
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Formatting.Indentation
     <ExportLanguageService(GetType(ISynchronousIndentationService), LanguageNames.VisualBasic), [Shared]>
diff --git a/src/EditorFeatures/VisualBasic/HighlightReferences/VisualBasicDocumentHighlightsService.vb b/src/EditorFeatures/VisualBasic/HighlightReferences/VisualBasicDocumentHighlightsService.vb
index fedd8f844ec4eded3c7a5796d02b544a438d7197..b0693439b5de748d8555c4749c7da6c93c3b18d3 100644
--- a/src/EditorFeatures/VisualBasic/HighlightReferences/VisualBasicDocumentHighlightsService.vb
+++ b/src/EditorFeatures/VisualBasic/HighlightReferences/VisualBasicDocumentHighlightsService.vb
@@ -2,7 +2,6 @@
 
 Imports System.Composition
 Imports Microsoft.CodeAnalysis.Editor.Implementation.ReferenceHighlighting
-Imports Microsoft.CodeAnalysis.Host
 Imports Microsoft.CodeAnalysis.Host.Mef
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.HighlightReferences
diff --git a/src/EditorFeatures/VisualBasic/InlineRename/VisualBasicEditorInlineRenameService.vb b/src/EditorFeatures/VisualBasic/InlineRename/VisualBasicEditorInlineRenameService.vb
index 4c9fc9841528c30484a1c4fcbbeb996de2634565..24e14e6aa8eb5976cdd6708970930be2a8688da4 100644
--- a/src/EditorFeatures/VisualBasic/InlineRename/VisualBasicEditorInlineRenameService.vb
+++ b/src/EditorFeatures/VisualBasic/InlineRename/VisualBasicEditorInlineRenameService.vb
@@ -2,9 +2,7 @@
 
 Imports System.Composition
 Imports Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
-Imports Microsoft.CodeAnalysis.Host
 Imports Microsoft.CodeAnalysis.Host.Mef
-Imports Microsoft.CodeAnalysis.LanguageServices
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.ImplementInterface
     <ExportLanguageService(GetType(IEditorInlineRenameService), LanguageNames.VisualBasic), [Shared]>
diff --git a/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb b/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb
index 1aadb76f7e8dac65d42c4706a919e16fc97126dd..ae6fd0ab0f6ace2c1dd7c0ca83623a521cdb0a3b 100644
--- a/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb
+++ b/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb
@@ -1,8 +1,6 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports System.Composition
-Imports Microsoft.CodeAnalysis.Host
-Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.VisualStudio.Utilities
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LanguageServices
diff --git a/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManagerFactory.vb b/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManagerFactory.vb
index d0e5a2fc5ab4e2608f41a413f362708213283a3b..8752f40781b5e54cbb454f3ef78a5613c37484ec 100644
--- a/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManagerFactory.vb
+++ b/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManagerFactory.vb
@@ -2,7 +2,6 @@
 
 Imports System.ComponentModel.Composition
 Imports Microsoft.VisualStudio.Text
-Imports Microsoft.VisualStudio.Text.Operations
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit
     <Export(GetType(CommitBufferManagerFactory))>
diff --git a/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb b/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb
index a62e09f6667cad7020dae91693c22d273b3ac571..d698d9e20c6512f5486d019f79c8fc97ae2a627b 100644
--- a/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb
+++ b/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb
@@ -7,7 +7,6 @@ Imports Microsoft.CodeAnalysis.CodeCleanup
 Imports Microsoft.CodeAnalysis.CodeCleanup.Providers
 Imports Microsoft.CodeAnalysis.Formatting
 Imports Microsoft.CodeAnalysis.Internal.Log
-Imports Microsoft.CodeAnalysis.Host
 Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.Formatting.Rules
 Imports Microsoft.CodeAnalysis.Text
diff --git a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateDefaultConstructorItem.vb b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateDefaultConstructorItem.vb
index 11a915a83a8bc9cb207ddba049cc2c68c7e2d092..2f14472747ffd5b4d44887da485dbc15a0f183eb 100644
--- a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateDefaultConstructorItem.vb
+++ b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateDefaultConstructorItem.vb
@@ -5,8 +5,6 @@ Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.CodeGeneration
 Imports Microsoft.CodeAnalysis.Editing
 Imports Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities
-Imports Microsoft.CodeAnalysis.Text
-Imports Microsoft.VisualStudio.Text
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar
     Friend Class GenerateDefaultConstructorItem
diff --git a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateEventHandlerItem.vb b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateEventHandlerItem.vb
index 707acaf6132bf9090779315b3615a23468fca282..f94dd802c6a65882f25f37907d165a695b2af12c 100644
--- a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateEventHandlerItem.vb
+++ b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateEventHandlerItem.vb
@@ -4,9 +4,7 @@ Imports System.Threading
 Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.CodeGeneration
 Imports Microsoft.CodeAnalysis.Editing
-Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
-Imports Microsoft.VisualStudio.Text
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar
     Friend Class GenerateEventHandlerItem
diff --git a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateFinalizerItem.vb b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateFinalizerItem.vb
index 1b960d46396fcce1919b9cfd5950e6fe4ae96636..10d3b021c9f46e482dbafc1e5e35f768b152f2b2 100644
--- a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateFinalizerItem.vb
+++ b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateFinalizerItem.vb
@@ -4,8 +4,6 @@ Imports System.Threading
 Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.CodeGeneration
 Imports Microsoft.CodeAnalysis.Editing
-Imports Microsoft.CodeAnalysis.Text
-Imports Microsoft.VisualStudio.Text
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar
     Friend Class GenerateFinalizerItem
diff --git a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateMethodItem.vb b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateMethodItem.vb
index 5610e38b54a85720455d4e2cea68bad3cf933c04..7e89f024c832f723fa75335ee79bf16286a43c93 100644
--- a/src/EditorFeatures/VisualBasic/NavigationBar/GenerateMethodItem.vb
+++ b/src/EditorFeatures/VisualBasic/NavigationBar/GenerateMethodItem.vb
@@ -3,9 +3,6 @@
 Imports System.Threading
 Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.CodeGeneration
-Imports Microsoft.CodeAnalysis.LanguageServices
-Imports Microsoft.CodeAnalysis.Text
-Imports Microsoft.VisualStudio.Text
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar
     Friend Class GenerateMethodItem
diff --git a/src/EditorFeatures/VisualBasic/QuickInfo/SemanticQuickInfoProvider.vb b/src/EditorFeatures/VisualBasic/QuickInfo/SemanticQuickInfoProvider.vb
index 4ce961c863e680364b09a250cf9b6f8d454e0a1a..f7b3bb0ee966963c54843f48585ef63ddaeb8e8b 100644
--- a/src/EditorFeatures/VisualBasic/QuickInfo/SemanticQuickInfoProvider.vb
+++ b/src/EditorFeatures/VisualBasic/QuickInfo/SemanticQuickInfoProvider.vb
@@ -9,10 +9,8 @@ Imports Microsoft.CodeAnalysis.Editor.Shared.Utilities
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Microsoft.CodeAnalysis.VisualBasic.Utilities.IntrinsicOperators
 Imports Microsoft.VisualStudio.Language.Intellisense
-Imports Microsoft.VisualStudio.Text
 Imports Microsoft.VisualStudio.Text.Editor
 Imports Microsoft.VisualStudio.Text.Projection
-Imports Microsoft.VisualStudio.Utilities
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.QuickInfo
 
@@ -21,15 +19,13 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.QuickInfo
         Inherits AbstractSemanticQuickInfoProvider
 
         <ImportingConstructor>
-        Public Sub New(textBufferFactoryService As ITextBufferFactoryService,
-                       contentTypeRegistryService As IContentTypeRegistryService,
-                       projectionBufferFactoryService As IProjectionBufferFactoryService,
+        Public Sub New(projectionBufferFactoryService As IProjectionBufferFactoryService,
                        editorOptionsFactoryService As IEditorOptionsFactoryService,
                        textEditorFactoryService As ITextEditorFactoryService,
                        glyphService As IGlyphService,
                        typeMap As ClassificationTypeMap)
-            MyBase.New(textBufferFactoryService, contentTypeRegistryService, projectionBufferFactoryService,
-                       editorOptionsFactoryService, textEditorFactoryService, glyphService, typeMap)
+            MyBase.New(projectionBufferFactoryService, editorOptionsFactoryService,
+                       textEditorFactoryService, glyphService, typeMap)
         End Sub
 
         Protected Overrides Async Function BuildContentAsync(document As Document,
diff --git a/src/EditorFeatures/VisualBasic/ReferenceHighlighting/ReferenceHighlightingAdditionalReferenceProvider.vb b/src/EditorFeatures/VisualBasic/ReferenceHighlighting/ReferenceHighlightingAdditionalReferenceProvider.vb
index f1e6978e80fcd40a0faf6ab1a36085ed58e2685b..2c95b09d3a2fb1b2edd86ee99f2c0f181016a035 100644
--- a/src/EditorFeatures/VisualBasic/ReferenceHighlighting/ReferenceHighlightingAdditionalReferenceProvider.vb
+++ b/src/EditorFeatures/VisualBasic/ReferenceHighlighting/ReferenceHighlightingAdditionalReferenceProvider.vb
@@ -4,7 +4,6 @@ Imports System.Composition
 Imports System.Threading
 Imports System.Threading.Tasks
 Imports Microsoft.CodeAnalysis.Editor.Implementation.ReferenceHighlighting
-Imports Microsoft.CodeAnalysis.Host
 Imports Microsoft.CodeAnalysis.Host.Mef
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.ReferenceHighlighting
diff --git a/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb b/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb
index a25c30c18fdc7fa590d4188cce9b375733f0cc1f..2a803acc46df30268931e28b23bc699e654d38a4 100644
--- a/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb
+++ b/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb
@@ -4,7 +4,6 @@ Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.Formatting.Rules
 Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.Shared.Utilities
-Imports Microsoft.CodeAnalysis.VisualBasic
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities
diff --git a/src/EditorFeatures/VisualBasic/Utilities/NamedTypeSymbolExtensions.vb b/src/EditorFeatures/VisualBasic/Utilities/NamedTypeSymbolExtensions.vb
index 4d5d60722a8d16f24a86c34dcf06c3851019084f..c79765810d660db34ea1d9d381abfd5e9109eca0 100644
--- a/src/EditorFeatures/VisualBasic/Utilities/NamedTypeSymbolExtensions.vb
+++ b/src/EditorFeatures/VisualBasic/Utilities/NamedTypeSymbolExtensions.vb
@@ -2,7 +2,6 @@
 
 Imports System.Runtime.CompilerServices
 Imports Microsoft.CodeAnalysis
-Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities
     Friend Module NamedTypeSymbolExtensions
diff --git a/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb b/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb
index bad05f1aa57093255696c28081521d59e54fe85b..c0a7d0117a1c2d924eda4ff8b8bb01bd2ba06474 100644
--- a/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb
@@ -26,8 +26,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.QuickInfo
             Dim noListeners = SpecializedCollections.EmptyEnumerable(Of Lazy(Of IAsynchronousOperationListener, FeatureMetadata))()
 
             Dim provider = New SemanticQuickInfoProvider(
-             workspace.GetService(Of ITextBufferFactoryService),
-             workspace.GetService(Of IContentTypeRegistryService),
              workspace.GetService(Of IProjectionBufferFactoryService),
              workspace.GetService(Of IEditorOptionsFactoryService),
              workspace.GetService(Of ITextEditorFactoryService),