diff --git a/References/Microsoft.TeamFoundation.Build.Workflow.dll b/References/Microsoft.TeamFoundation.Build.Workflow.dll
deleted file mode 100644
index 6848c97..0000000
Binary files a/References/Microsoft.TeamFoundation.Build.Workflow.dll and /dev/null differ
diff --git a/References/Microsoft.TeamFoundation.VersionControl.Controls.dll b/References/Microsoft.TeamFoundation.VersionControl.Controls.dll
deleted file mode 100644
index 8ebaed7..0000000
Binary files a/References/Microsoft.TeamFoundation.VersionControl.Controls.dll and /dev/null differ
diff --git a/TeamProjectManager.Modules.BuildDefinitions/TeamProjectManager.Modules.BuildDefinitions.csproj b/TeamProjectManager.Modules.BuildDefinitions/TeamProjectManager.Modules.BuildDefinitions.csproj
index 1192bc4..31ebf29 100644
--- a/TeamProjectManager.Modules.BuildDefinitions/TeamProjectManager.Modules.BuildDefinitions.csproj
+++ b/TeamProjectManager.Modules.BuildDefinitions/TeamProjectManager.Modules.BuildDefinitions.csproj
@@ -69,10 +69,6 @@
       <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.102.0\lib\net45\Microsoft.TeamFoundation.Build.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.TeamFoundation.Build.Workflow, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\References\Microsoft.TeamFoundation.Build.Workflow.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Microsoft.TeamFoundation.Build2.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.TeamFoundationServer.Client.14.102.0\lib\net45\Microsoft.TeamFoundation.Build2.WebApi.dll</HintPath>
       <Private>True</Private>
@@ -173,9 +169,6 @@
       <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.102.0\lib\net45\Microsoft.TeamFoundation.VersionControl.Common.Integration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.TeamFoundation.VersionControl.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\References\Microsoft.TeamFoundation.VersionControl.Controls.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.TeamFoundation.Work.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.TeamFoundationServer.Client.14.102.0\lib\net45\Microsoft.TeamFoundation.Work.WebApi.dll</HintPath>
       <Private>True</Private>
diff --git a/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesView.xaml b/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesView.xaml
index 95dc9d8..6298cac 100644
--- a/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesView.xaml
+++ b/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesView.xaml
@@ -79,15 +79,13 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
                     <Label Grid.Row="0" Grid.Column="0" Content="XAML Server Path In Source Control" />
-                    <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Path=TemplateServerPath, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,5,0" />
-                    <Button Grid.Row="0" Grid.Column="2" Content="..." Command="{Binding Path=BrowseTemplateServerPathCommand}" Padding="5,0,5,0" />
+                    <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Path=TemplateServerPath, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
 
                     <Label Grid.Row="1" Grid.Column="0" Content="Template Type" Margin="0,5,0,0" />
-                    <ComboBox Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="1" Margin="5,5,0,0">
+                    <ComboBox Grid.Row="1" Grid.Column="1" Margin="5,5,0,0">
                         <ComboBoxItem Content="Default" IsSelected="{Binding Path=TemplateType, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Default}" />
                         <ComboBoxItem Content="Upgrade" IsSelected="{Binding Path=TemplateType, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Upgrade}" />
                         <ComboBoxItem Content="Custom" IsSelected="{Binding Path=TemplateType, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter=Custom}" />
diff --git a/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesViewModel.cs b/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesViewModel.cs
index 29976ab..f2de991 100644
--- a/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesViewModel.cs
+++ b/TeamProjectManager.Modules.BuildProcessTemplates/BuildProcessTemplatesViewModel.cs
@@ -1,15 +1,10 @@
 using Microsoft.Practices.Prism.Events;
 using Microsoft.TeamFoundation.Build.Client;
-using Microsoft.TeamFoundation.VersionControl.Client;
-using Microsoft.TeamFoundation.VersionControl.Controls;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.Composition;
-using System.Diagnostics;
-using System.Globalization;
 using System.Linq;
-using System.Reflection;
 using System.Windows;
 using TeamProjectManager.Common;
 using TeamProjectManager.Common.Events;
@@ -26,7 +21,6 @@ public class BuildProcessTemplatesViewModel : ViewModelBase
         public RelayCommand RegisterBuildProcessTemplateCommand { get; private set; }
         public RelayCommand GetBuildProcessTemplatesCommand { get; private set; }
         public RelayCommand DeleteSelectedBuildProcessTemplatesCommand { get; private set; }
-        public RelayCommand BrowseTemplateServerPathCommand { get; private set; }
 
         #endregion
 
@@ -120,49 +114,12 @@ public BuildProcessTemplatesViewModel(IEventAggregator eventAggregator, ILogger
             this.RegisterBuildProcessTemplateCommand = new RelayCommand(RegisterBuildProcessTemplate, CanRegisterBuildProcessTemplate);
             this.GetBuildProcessTemplatesCommand = new RelayCommand(GetBuildProcessTemplates, CanGetBuildProcessTemplates);
             this.DeleteSelectedBuildProcessTemplatesCommand = new RelayCommand(DeleteSelectedBuildProcessTemplates, CanDeleteSelectedBuildProcessTemplates);
-            this.BrowseTemplateServerPathCommand = new RelayCommand(BrowseTemplateServerPath, CanBrowseTemplateServerPath);
         }
 
         #endregion
 
         #region Commands
 
-        private bool CanBrowseTemplateServerPath(object argument)
-        {
-            return this.SelectedTeamProjectCollection != null;
-        }
-
-        private void BrowseTemplateServerPath(object argument)
-        {
-            var tfs = GetSelectedTfsTeamProjectCollection();
-            var vcs = tfs.GetService<VersionControlServer>();
-            try
-            {
-                var assembly = Assembly.GetAssembly(typeof(WorkItemPolicy));
-                var args = new object[] { vcs };
-                using (var dialog = (System.Windows.Forms.Form)assembly.CreateInstance("Microsoft.TeamFoundation.VersionControl.Controls.DialogChooseItem", false, BindingFlags.CreateInstance | BindingFlags.NonPublic | BindingFlags.Instance, null, args, CultureInfo.CurrentCulture, null))
-                {
-                    dialog.GetType().GetProperty("AllowFileOnly").SetValue(dialog, true, null);
-                    dialog.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-                    var result = dialog.ShowDialog(Application.Current.MainWindow.GetIWin32Window());
-                    if (result == System.Windows.Forms.DialogResult.OK)
-                    {
-                        var item = (Item)dialog.GetType().GetProperty("SelectedItem", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(dialog, null);
-                        if (item != null)
-                        {
-                            this.TemplateServerPath = item.ServerItem;
-                        }
-                    }
-                }
-            }
-            catch (Exception exc)
-            {
-                var message = "There was a problem showing the internal TFS Source Control file browser dialog.";
-                Logger.Log(message, exc, TraceEventType.Warning);
-                MessageBox.Show(message + " See the log file for details.", "Error", MessageBoxButton.OK, MessageBoxImage.Warning);
-            }
-        }
-
         private bool CanGetBuildProcessTemplates(object argument)
         {
             return IsAnyTeamProjectSelected();
diff --git a/TeamProjectManager.Modules.BuildProcessTemplates/TeamProjectManager.Modules.BuildProcessTemplates.csproj b/TeamProjectManager.Modules.BuildProcessTemplates/TeamProjectManager.Modules.BuildProcessTemplates.csproj
index be8b75d..33d7f61 100644
--- a/TeamProjectManager.Modules.BuildProcessTemplates/TeamProjectManager.Modules.BuildProcessTemplates.csproj
+++ b/TeamProjectManager.Modules.BuildProcessTemplates/TeamProjectManager.Modules.BuildProcessTemplates.csproj
@@ -174,9 +174,6 @@
       <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.102.0\lib\net45\Microsoft.TeamFoundation.VersionControl.Common.Integration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.TeamFoundation.VersionControl.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\References\Microsoft.TeamFoundation.VersionControl.Controls.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.TeamFoundation.Work.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.TeamFoundationServer.Client.14.102.0\lib\net45\Microsoft.TeamFoundation.Work.WebApi.dll</HintPath>
       <Private>True</Private>
diff --git a/TeamProjectManager.Modules.SourceControl/TeamProjectManager.Modules.SourceControl.csproj b/TeamProjectManager.Modules.SourceControl/TeamProjectManager.Modules.SourceControl.csproj
index 3ee5302..294a6c8 100644
--- a/TeamProjectManager.Modules.SourceControl/TeamProjectManager.Modules.SourceControl.csproj
+++ b/TeamProjectManager.Modules.SourceControl/TeamProjectManager.Modules.SourceControl.csproj
@@ -169,9 +169,6 @@
       <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.102.0\lib\net45\Microsoft.TeamFoundation.VersionControl.Common.Integration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.TeamFoundation.VersionControl.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\References\Microsoft.TeamFoundation.VersionControl.Controls.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.TeamFoundation.Work.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.TeamFoundationServer.Client.14.102.0\lib\net45\Microsoft.TeamFoundation.Work.WebApi.dll</HintPath>
       <Private>True</Private>
diff --git a/TeamProjectManager.Shell/TeamProjectManager.Shell.csproj b/TeamProjectManager.Shell/TeamProjectManager.Shell.csproj
index 450df50..b1b468d 100644
--- a/TeamProjectManager.Shell/TeamProjectManager.Shell.csproj
+++ b/TeamProjectManager.Shell/TeamProjectManager.Shell.csproj
@@ -95,9 +95,6 @@
       <HintPath>..\packages\Microsoft.VisualStudio.Services.Client.14.102.0\lib\net45\Microsoft.TeamFoundation.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.TeamFoundation.Controls">
-      <HintPath>..\References\Microsoft.TeamFoundation.Controls.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.TeamFoundation.Core.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.TeamFoundationServer.Client.14.102.0\lib\net45\Microsoft.TeamFoundation.Core.WebApi.dll</HintPath>
       <Private>True</Private>
@@ -182,9 +179,6 @@
       <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.102.0\lib\net45\Microsoft.TeamFoundation.VersionControl.Common.Integration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.TeamFoundation.VersionControl.Controls.Common">
-      <HintPath>..\References\Microsoft.TeamFoundation.VersionControl.Controls.Common.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.TeamFoundation.Work.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.TeamFoundationServer.Client.14.102.0\lib\net45\Microsoft.TeamFoundation.Work.WebApi.dll</HintPath>
       <Private>True</Private>
@@ -205,12 +199,6 @@
       <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.102.0\lib\net45\Microsoft.TeamFoundation.WorkItemTracking.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.TeamFoundation.WorkItemTracking.Controls">
-      <HintPath>..\References\Microsoft.TeamFoundation.WorkItemTracking.Controls.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.TeamFoundation.WorkItemTracking.ControlsCore">
-      <HintPath>..\References\Microsoft.TeamFoundation.WorkItemTracking.ControlsCore.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.TeamFoundation.WorkItemTracking.Proxy, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.102.0\lib\net45\Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll</HintPath>
       <Private>True</Private>