diff --git a/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs b/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs
index 6daf2e6050344296d511b364f7b06d889bb3640c..78f745a22a5cbff531691fb01428ee698ed117f6 100644
--- a/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs
+++ b/src/EditorFeatures/Test/FindReferences/FindReferencesCommandHandlerTests.cs
@@ -4,8 +4,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Editor.Commands;
+using Microsoft.CodeAnalysis.Editor.FindReferences;
 using Microsoft.CodeAnalysis.Editor.Host;
-using Microsoft.CodeAnalysis.Editor.Implementation.FindReferences;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
 using Microsoft.CodeAnalysis.FindUsages;
diff --git a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb
index 0ea3fb4e45a3a27555a85828a1ac98b131195ad4..5171e7916671174754f45daad5f66c447d84e6fd 100644
--- a/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb
+++ b/src/EditorFeatures/Test2/GoToImplementation/GoToImplementationTests.vb
@@ -13,8 +13,8 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.GoToImplementation
             Return GoToTestHelpers.TestAsync(workspaceDefinition, shouldSucceed,
                 Function(document As Document, cursorPosition As Integer, presenters As IEnumerable(Of Lazy(Of INavigableItemsPresenter)))
                     Dim service = If(document.Project.Language = LanguageNames.CSharp,
-                        DirectCast(New CSharpGoToImplementationService(presenters, {}), IGoToImplementationService),
-                        New VisualBasicGoToImplementationService(presenters, {}))
+                        DirectCast(New CSharpGoToImplementationService(presenters), IGoToImplementationService),
+                        New VisualBasicGoToImplementationService(presenters))
 
                     Dim message As String = Nothing
                     Return service.TryGoToImplementation(document, cursorPosition, CancellationToken.None, message)
diff --git a/src/EditorFeatures/VisualBasic/FindReferences/VisualBasicFindReferencesService.vb b/src/EditorFeatures/VisualBasic/FindReferences/VisualBasicFindReferencesService.vb
index 407db685ed011397790627ea10051ab785b19839..d91169f6ee3fcdf7fe6bc8ca3c1d084ff1d9d01b 100644
--- a/src/EditorFeatures/VisualBasic/FindReferences/VisualBasicFindReferencesService.vb
+++ b/src/EditorFeatures/VisualBasic/FindReferences/VisualBasicFindReferencesService.vb
@@ -1,8 +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.
 
 Imports System.Composition
+Imports Microsoft.CodeAnalysis.Editor.FindReferences
 Imports Microsoft.CodeAnalysis.Editor.Host
-Imports Microsoft.CodeAnalysis.Editor.Implementation.FindReferences
 Imports Microsoft.CodeAnalysis.Host.Mef
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.FindReferences
diff --git a/src/EditorFeatures/VisualBasic/GoToImplementation/VisualBasicGoToImplementationService.vb b/src/EditorFeatures/VisualBasic/GoToImplementation/VisualBasicGoToImplementationService.vb
index 6ffbfd7cf732d97e37c78869d419f1768a0bf7e7..d51fc6252b7738d30be15ed8751b52837a5380c1 100644
--- a/src/EditorFeatures/VisualBasic/GoToImplementation/VisualBasicGoToImplementationService.vb
+++ b/src/EditorFeatures/VisualBasic/GoToImplementation/VisualBasicGoToImplementationService.vb
@@ -1,8 +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.
 
 Imports System.Composition
+Imports Microsoft.CodeAnalysis.Editor.GoToImplementation
 Imports Microsoft.CodeAnalysis.Editor.Host
-Imports Microsoft.CodeAnalysis.Editor.Implementation.GoToImplementation
 Imports Microsoft.CodeAnalysis.Host.Mef
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GoToImplementation
@@ -11,9 +11,18 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GoToImplementation
         Inherits AbstractGoToImplementationService
 
         <ImportingConstructor>
-        Public Sub New(<ImportMany> presenters As IEnumerable(Of Lazy(Of INavigableItemsPresenter)),
-                       <ImportMany> streamingPresenters As IEnumerable(Of Lazy(Of IStreamingFindUsagesPresenter)))
-            MyBase.New(presenters, streamingPresenters)
+        Public Sub New(<ImportMany> presenters As IEnumerable(Of Lazy(Of INavigableItemsPresenter)))
+            MyBase.New(presenters)
         End Sub
     End Class
-End Namespace
+
+    <ExportLanguageService(GetType(IStreamingFindImplementationsService), LanguageNames.VisualBasic), [Shared]>
+    Friend Class VisualBasicStreamingGoToImplementationService
+        Inherits AbstractGoToImplementationService
+
+        <ImportingConstructor>
+        Public Sub New(<ImportMany> presenters As IEnumerable(Of Lazy(Of INavigableItemsPresenter)))
+            MyBase.New(presenters)
+        End Sub
+    End Class
+End Namespace
\ No newline at end of file