diff --git a/vsintegration/src/FSharp.LanguageService.Base/DocumentTask.cs b/vsintegration/src/FSharp.LanguageService.Base/DocumentTask.cs
index 058562cf0f0..d6664bb6a5f 100644
--- a/vsintegration/src/FSharp.LanguageService.Base/DocumentTask.cs
+++ b/vsintegration/src/FSharp.LanguageService.Base/DocumentTask.cs
@@ -21,7 +21,8 @@
 using VsShell = Microsoft.VisualStudio.Shell.VsShellUtilities;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Microsoft.VisualStudio.FSharp.LanguageService {
+namespace Microsoft.VisualStudio.FSharp.LanguageService
+{
     internal static class UIThread {
         static SynchronizationContext ctxt;
         static bool isUnitTestingMode = false;
diff --git a/vsintegration/src/FSharp.LanguageService.Base/LanguageService.cs b/vsintegration/src/FSharp.LanguageService.Base/LanguageService.cs
index 18a00ea5f32..257f638cb45 100644
--- a/vsintegration/src/FSharp.LanguageService.Base/LanguageService.cs
+++ b/vsintegration/src/FSharp.LanguageService.Base/LanguageService.cs
@@ -685,8 +685,8 @@ internal BackgroundRequest_DEPRECATED CreateBackgroundRequest(FSharpSourceBase_D
         // Implemented in FSharpLanguageService.fs
         internal abstract BackgroundRequest_DEPRECATED CreateBackgroundRequest(int line, int col, TokenInfo info, string sourceText, ITextSnapshot snapshot, MethodTipMiscellany_DEPRECATED methodTipMiscellany, string fname, BackgroundRequestReason reason, IVsTextView view,AuthoringSink sink, ISource source, int timestamp, bool synchronous);
 
-		// Implemented in FSharpLanguageService.fs
-		internal abstract void OnParseFileOrCheckFileComplete(BackgroundRequest_DEPRECATED req);
+        // Implemented in FSharpLanguageService.fs
+        internal abstract void OnParseFileOrCheckFileComplete(BackgroundRequest_DEPRECATED req);
 
         internal void EnsureBackgroundThreadStarted()
         {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFileItem.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFileItem.cs
index 1d78317e975..02480c09721 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFileItem.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFileItem.cs
@@ -15,7 +15,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFolderItem.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFolderItem.cs
index d3c6b2edc2f..af1fadcee67 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFolderItem.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAFolderItem.cs
@@ -13,7 +13,6 @@
 using EnvDTE;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OANavigableProjectItems.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OANavigableProjectItems.cs
index 00856b2e545..6c2ae1e5919 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OANavigableProjectItems.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OANavigableProjectItems.cs
@@ -13,7 +13,6 @@
 using Microsoft.VisualStudio.OLE.Interop;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProject.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProject.cs
index 985f6418880..412c70e0c94 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProject.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProject.cs
@@ -15,7 +15,6 @@
 using EnvDTE;
 using System.Globalization;
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItem.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItem.cs
index 30f5ba319f1..90dc6bfec7e 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItem.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItem.cs
@@ -12,7 +12,6 @@
 using Microsoft.VisualStudio.OLE.Interop;
 using EnvDTE;
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItems.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItems.cs
index 7b034447426..a9e5c8aff4c 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItems.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProjectItems.cs
@@ -16,8 +16,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
-using Microsoft.VisualStudio.FSharp.LanguageService;
-
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProperties.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProperties.cs
index 86b2369a6c8..f8079efb6b6 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProperties.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/OAProperties.cs
@@ -14,7 +14,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferenceBase.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferenceBase.cs
index 6b819efea63..47190a2b7f7 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferenceBase.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferenceBase.cs
@@ -6,7 +6,6 @@
 using Microsoft.VisualStudio.FSharp.ProjectSystem;
 using VSLangProj;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferences.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferences.cs
index 474acd48c3d..bd6be170d23 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferences.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/Automation/VSProject/OAReferences.cs
@@ -11,7 +11,6 @@
 using VSLangProj;
 using System.Collections;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem.Automation
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ConfigurationProperties.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ConfigurationProperties.cs
index b553ef663d6..ce799dbfe2c 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ConfigurationProperties.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ConfigurationProperties.cs
@@ -11,7 +11,6 @@
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem
 {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs
index 7d8bcaa1bed..f26be0429f0 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs
@@ -3172,7 +3172,7 @@ string newTargetFrameworkMoniker
 
                     // replace existing fscore with one that has matching version with current target framework
                     var existingFsCore =
-                        Microsoft.VisualStudio.FSharp.LanguageService.UIThread.DoOnUIThread(
+                        UIThread.DoOnUIThread(
                             () => references
                                 .OfType<Automation.OAAssemblyReference>()
                                 .FirstOrDefault(r => r.Name == fsCoreName.Name && r.PublicKeyToken == Utilities.FsCorePublicKeyToken && r.Culture == fsCoreName.CultureName)
@@ -3180,7 +3180,7 @@ string newTargetFrameworkMoniker
 
                     if (existingFsCore != null)
                     {
-                        Microsoft.VisualStudio.FSharp.LanguageService.UIThread.DoOnUIThread(() =>
+                        UIThread.DoOnUIThread(() =>
                         {
                             // save copyLocal value - after calling existingFsCore.Remove() becomes invalid and can raise exceptions
                             var copyLocal = existingFsCore.CopyLocal;
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs
index 9c14f377ca9..edb1883ff8e 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/IDEBuildLogger.cs
@@ -14,7 +14,6 @@
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.Win32;
 using IOleServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem
 {
@@ -251,22 +250,22 @@ private void AddToErrorList(
             span.iEndLine = endLine < startLine ? span.iStartLine : endLine;
             span.iEndIndex = (endColumn < startColumn) && (span.iStartLine == span.iEndLine) ? span.iStartIndex : endColumn;
 
-			if (OutputWindowPane != null
-				&& (this.Verbosity != LoggerVerbosity.Quiet || errorEvent is BuildErrorEventArgs))
-			{
-				// Format error and output it to the output window
-				string message = this.FormatMessage(errorEvent.Message);
+            if (OutputWindowPane != null
+                && (this.Verbosity != LoggerVerbosity.Quiet || errorEvent is BuildErrorEventArgs))
+            {
+                // Format error and output it to the output window
+                string message = this.FormatMessage(errorEvent.Message);
                 DefaultCompilerError e = new DefaultCompilerError(file,
                                                 span.iStartLine,
                                                 span.iStartIndex,
                                                 span.iEndLine,
                                                 span.iEndIndex,
                                                 errorCode,
-					                            message);
-				e.IsWarning = isWarning;
+                                                message);
+                e.IsWarning = isWarning;
 
-				Output(GetFormattedErrorMessage(e));
-			}
+                Output(GetFormattedErrorMessage(e));
+            }
 
             UIThread.Run(delegate()
             {
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/NodeProperties.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/NodeProperties.cs
index 13ca5d368d5..bf72d2f4734 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/NodeProperties.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/NodeProperties.cs
@@ -20,7 +20,6 @@
 using IOleServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
 using IServiceProvider = System.IServiceProvider;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 using System.Runtime.Versioning;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectConfig.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectConfig.cs
index 44a3bfa5ddf..41832e24b27 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectConfig.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectConfig.cs
@@ -12,7 +12,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Microsoft.VisualStudio.FSharp.LanguageService;
 using Microsoft.Win32;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs
index fae3278f5d9..c69c4a12295 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectNode.cs
@@ -35,8 +35,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.Build.Execution;
-
-using Microsoft.VisualStudio.FSharp.LanguageService;
 using Microsoft.VisualStudio.TextManager.Interop;
 
 namespace Microsoft.VisualStudio.FSharp.ProjectSystem
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs
index 850f0ea2ed1..e843985a16b 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectReferenceNode.cs
@@ -244,7 +244,7 @@ public void DropReferencedProjectCache()
         /// </summary>
         public void CleanProjectReferenceErrorState()
         {
-            Microsoft.VisualStudio.FSharp.LanguageService.UIThread.DoOnUIThread(() =>
+            UIThread.DoOnUIThread(() =>
                 {
                     if (projectRefError != null)
                     {
@@ -262,7 +262,7 @@ public void CleanProjectReferenceErrorState()
         /// <param name="text"></param>
         private void SetError(string text)
         {
-            Microsoft.VisualStudio.FSharp.LanguageService.UIThread.DoOnUIThread(() =>
+            UIThread.DoOnUIThread(() =>
                 {
                     // delete existing error if exists
                     CleanProjectReferenceErrorState();
@@ -295,7 +295,7 @@ private void SetProjectReferencesHigherVersionWarningMessage()
         /// </summary>
         public void RefreshProjectReferenceErrorState()
         {
-            Microsoft.VisualStudio.FSharp.LanguageService.UIThread.DoOnUIThread(() =>
+            UIThread.DoOnUIThread(() =>
                 {
                     CleanProjectReferenceErrorState();
 
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/UIThread.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Project/UIThread.cs
index 1a0bb06e4ec..e35eccd1318 100644
--- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/UIThread.cs
+++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/UIThread.cs
@@ -21,7 +21,7 @@
 using VsShell = Microsoft.VisualStudio.Shell.VsShellUtilities;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Microsoft.VisualStudio.FSharp.LanguageService
+namespace Microsoft.VisualStudio.FSharp.ProjectSystem
 {
     internal static class UIThread
     {
diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs b/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
index 33bb1245c6e..d33ea17447b 100644
--- a/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
+++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs
@@ -200,7 +200,8 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
                 resourceValue
 
             override this.Initialize() =
-                UIThread.CaptureSynchronizationContext()
+                Microsoft.VisualStudio.FSharp.LanguageService.UIThread.CaptureSynchronizationContext()
+                Microsoft.VisualStudio.FSharp.ProjectSystem.UIThread.CaptureSynchronizationContext()
 
                 base.Initialize()
 
diff --git a/vsintegration/tests/UnitTests/TestLib.Utils.fs b/vsintegration/tests/UnitTests/TestLib.Utils.fs
index 378e0ee25b8..377384039c4 100644
--- a/vsintegration/tests/UnitTests/TestLib.Utils.fs
+++ b/vsintegration/tests/UnitTests/TestLib.Utils.fs
@@ -52,6 +52,7 @@ module Asserts =
 
 module UIStuff =
     let SetupSynchronizationContext() =
+        Microsoft.VisualStudio.FSharp.ProjectSystem.UIThread.InitUnitTestingMode()
         Microsoft.VisualStudio.FSharp.LanguageService.UIThread.InitUnitTestingMode()
 
 module FilesystemHelpers =