diff --git a/src/GitHub.VisualStudio/Base/PackageBase.cs b/src/GitHub.VisualStudio/Base/PackageBase.cs
index 4e7118bd4..95ed1aeb4 100644
--- a/src/GitHub.VisualStudio/Base/PackageBase.cs
+++ b/src/GitHub.VisualStudio/Base/PackageBase.cs
@@ -1,13 +1,8 @@
-using GitHub.VisualStudio.Services;
-using Microsoft.VisualStudio.ComponentModelHost;
+using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.Design;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GitHub.VisualStudio
 {
diff --git a/src/GitHub.VisualStudio/Base/TeamExplorerBase.cs b/src/GitHub.VisualStudio/Base/TeamExplorerBase.cs
index a16ead93f..8b71cadb5 100644
--- a/src/GitHub.VisualStudio/Base/TeamExplorerBase.cs
+++ b/src/GitHub.VisualStudio/Base/TeamExplorerBase.cs
@@ -1,16 +1,11 @@
-using GitHub.VisualStudio.Helpers;
-using Microsoft.TeamFoundation.Client;
+using Microsoft.TeamFoundation.Client;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace GitHub.VisualStudio.Base
 {
-    public abstract class TeamExplorerBase : IDisposable, INotifyPropertyChanged
+    abstract class TeamExplorerBase : IDisposable, INotifyPropertyChanged
     {
         bool subscribed = false;
 
diff --git a/src/GitHub.VisualStudio/Base/TeamExplorerSectionBase.cs b/src/GitHub.VisualStudio/Base/TeamExplorerSectionBase.cs
index 0bcf81a6b..64c17331f 100644
--- a/src/GitHub.VisualStudio/Base/TeamExplorerSectionBase.cs
+++ b/src/GitHub.VisualStudio/Base/TeamExplorerSectionBase.cs
@@ -1,13 +1,9 @@
-using GitHub.VisualStudio.Helpers;
+using GitHub.VisualStudio.Base;
 using Microsoft.TeamFoundation.Controls;
 using NullGuard;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace GitHub.VisualStudio.Base
+namespace GitHub.VisualStudio
 {
     class TeamExplorerSectionBase : TeamExplorerBase, ITeamExplorerSection, INotifyPropertySource
     {
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
index dd4f9d1a2..3dd6fad21 100644
--- a/src/GitHub.VisualStudio/GitHubPackage.cs
+++ b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -1,27 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.ComponentModel.Composition.Hosting;
-using System.ComponentModel.Design;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Windows;
-using GitHub.Authentication;
-using GitHub.Infrastructure;
-using GitHub.ViewModels;
 using GitHub.VisualStudio.UI.Views;
-using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Shell;
-using ReactiveUI;
-using Splat;
 using GitHub.Exports;
-using GitHub.VisualStudio.Services;
 
 namespace GitHub.VisualStudio
 {
diff --git a/src/GitHub.VisualStudio/Helpers/ExportFactoryProvider.cs b/src/GitHub.VisualStudio/Helpers/ExportFactoryProvider.cs
index 999f21a02..775929aa5 100644
--- a/src/GitHub.VisualStudio/Helpers/ExportFactoryProvider.cs
+++ b/src/GitHub.VisualStudio/Helpers/ExportFactoryProvider.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.Composition;
 
 namespace GitHub.Exports
 {
diff --git a/src/GitHub.VisualStudio/Helpers/INotifyPropertySource.cs b/src/GitHub.VisualStudio/Helpers/INotifyPropertySource.cs
index 4111243f7..dd91cf6ee 100644
--- a/src/GitHub.VisualStudio/Helpers/INotifyPropertySource.cs
+++ b/src/GitHub.VisualStudio/Helpers/INotifyPropertySource.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace GitHub.VisualStudio.Helpers
+namespace GitHub.VisualStudio
 {
     public interface INotifyPropertySource
     {
diff --git a/src/GitHub.VisualStudio/Helpers/PropertyNotifierExtensions.cs b/src/GitHub.VisualStudio/Helpers/PropertyNotifierExtensions.cs
index 8876913da..48fd7b40c 100644
--- a/src/GitHub.VisualStudio/Helpers/PropertyNotifierExtensions.cs
+++ b/src/GitHub.VisualStudio/Helpers/PropertyNotifierExtensions.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.CompilerServices;
 
-namespace GitHub.VisualStudio.Helpers
+namespace GitHub.VisualStudio
 {
     public static class PropertyNotifierExtensions
     {
diff --git a/src/GitHub.VisualStudio/Services/UIProvider.cs b/src/GitHub.VisualStudio/Services/UIProvider.cs
index 0eae7837b..52014eebf 100644
--- a/src/GitHub.VisualStudio/Services/UIProvider.cs
+++ b/src/GitHub.VisualStudio/Services/UIProvider.cs
@@ -2,17 +2,14 @@
 using ReactiveUI;
 using Splat;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
 using System.Globalization;
 using System.Linq;
 using System.Reactive.Concurrency;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 
-namespace GitHub.VisualStudio.Services
+namespace GitHub.VisualStudio
 {
     [Export]
     [PartCreationPolicy(CreationPolicy.Shared)]