diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
index bbb1a00524afde2c894ca7bb6eade43aed4f40ab..4e7757eb58897b9f0fa0660655e93aaf591d5795 100644
--- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
+++ b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
@@ -35,7 +35,7 @@ open Microsoft.VisualStudio.Shell
 open Microsoft.VisualStudio.Shell.Interop
 open Microsoft.VisualStudio.ComponentModelHost
 
-/// Exposes FSharpChecker as MEF export
+// Exposes FSharpChecker as MEF export
 [<Export(typeof<FSharpCheckerProvider>); Composition.Shared>]
 type internal FSharpCheckerProvider 
     [<ImportingConstructor>]
@@ -82,10 +82,10 @@ type internal FSharpCheckerProvider
 
 
 /// Exposes FCS FSharpProjectOptions information management as MEF component.
-///
-/// This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
-/// It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
-/// The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
+//
+// This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
+// It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
+// The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
 [<Export(typeof<FSharpProjectOptionsManager>); Composition.Shared>]
 type internal FSharpProjectOptionsManager
     [<ImportingConstructor>]
diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
index 5ac5900f574beceba90b19d9afe0a4bed3c7ed04..22c3f49cf78758c60afe417007864161ee5aa000 100644
--- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
@@ -67,7 +67,6 @@
       <GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>
     </EmbeddedResource>
     <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="LanguageServiceConstants.fs" />
     <Compile Include="Error.fs" />
     <Compile Include="Vs.fs" />
     <Compile Include="Colorize.fs" />
diff --git a/vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs b/vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs
deleted file mode 100644
index b64d0405948cd47549d6a303560cf83f24a6904c..0000000000000000000000000000000000000000
--- a/vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
-
-namespace Microsoft.VisualStudio.FSharp.LanguageService
-
-[<RequireQualifiedAccess>]
-module internal LanguageServiceConstants =
-    
-    /// "F#"
-    [<Literal>]
-    let FSharpLanguageName = "F#"
diff --git a/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs b/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
index f5abc9eca30b493a6848a18b62bf6c849b5e6397..22ea0db010759d87c5f3845c2aeb8a91c0934da8 100644
--- a/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
+++ b/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
@@ -34,20 +34,23 @@ module internal rec Microsoft.VisualStudio.FSharp.LanguageService.SiteProvider
 
 open System
 open System.Collections.Concurrent
-open System.Diagnostics
+open System.ComponentModel.Composition
 open System.IO
-
-open Microsoft.CodeAnalysis
+open System.Diagnostics
+open Microsoft.VisualStudio
+open Microsoft.VisualStudio.TextManager.Interop
+open Microsoft.VisualStudio.Shell.Interop
 open Microsoft.FSharp.Compiler.SourceCodeServices
 
-open Microsoft.VisualStudio
-open Microsoft.VisualStudio.FSharp.LanguageService
+open Microsoft.CodeAnalysis
+open Microsoft.VisualStudio.LanguageServices
 open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
 open Microsoft.VisualStudio.LanguageServices.Implementation.TaskList
-open Microsoft.VisualStudio.Shell.Interop
-open Microsoft.VisualStudio.TextManager.Interop
-
 open VSLangProj
+open System.ComponentModel.Composition.Primitives
+open Microsoft.VisualStudio.Shell
+open System.Collections.Immutable
+
 
 /// An additional interface that an IProjectSite object can implement to indicate it has an FSharpProjectOptions 
 /// already available, so we don't have to recreate it
@@ -271,7 +274,7 @@ type internal ProjectSitesAndFiles() =
                         if not (isNull project) then
                             for reference in project.ProjectReferences do
                                 let project = workspace.CurrentSolution.GetProject(reference.ProjectId)
-                                if not (isNull project) && project.Language = LanguageServiceConstants.FSharpLanguageName then
+                                if not (isNull project) then
                                     let siteProvider = provideProjectSiteProvider (workspace, project, serviceProvider, projectOptionsTable)
                                     let referenceProject = workspace.ProjectTracker.GetProject(reference.ProjectId)
                                     let outputPath = referenceProject.BinOutputPath