diff --git a/Nuclex.Support (net-4.0).csproj b/Nuclex.Support (net-4.0).csproj
index b365295..c4b4e6d 100644
--- a/Nuclex.Support (net-4.0).csproj	
+++ b/Nuclex.Support (net-4.0).csproj	
@@ -150,55 +150,10 @@
     <Compile Include="Source\Plugins\PrototypeFactory.Test.cs">
       <DependentUpon>PrototypeFactory.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Scheduling\GenericTimeSource.Test.cs">
-      <DependentUpon>GenericTimeSource.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ISchedulerService.cs" />
-    <Compile Include="Source\Scheduling\ITimeSource.cs" />
-    <Compile Include="Source\Scheduling\Scheduler.cs" />
-    <Compile Include="Source\Scheduling\GenericTimeSource.cs" />
-    <Compile Include="Source\Scheduling\Scheduler.Test.cs">
-      <DependentUpon>Scheduler.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\Scheduler.TimeSource.cs">
-      <DependentUpon>Scheduler.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\WindowsTimeSource.cs" />
-    <Compile Include="Source\Scheduling\WindowsTimeSource.Test.cs">
-      <DependentUpon>WindowsTimeSource.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\Semaphore.cs" />
     <Compile Include="Source\Semaphore.Test.cs">
       <DependentUpon>Semaphore.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Services\AppDomainTypeLister.cs" />
-    <Compile Include="Source\Services\AppDomainTypeLister.Test.cs">
-      <DependentUpon>AppDomainTypeLister.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Services\MultiAssemblyTypeLister.cs" />
-    <Compile Include="Source\Services\ExplicitTypeLister.Test.cs">
-      <DependentUpon>ExplicitTypeLister.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Services\Instancing.cs" />
-    <Compile Include="Source\Services\ITypeLister.cs" />
-    <Compile Include="Source\Services\MultiAssemblyTypeLister.Test.cs">
-      <DependentUpon>MultiAssemblyTypeLister.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Services\ProgressTracking\IProgressPublishingService.cs" />
-    <Compile Include="Source\Services\ProgressTracking\IProgressCollectingService.cs" />
-    <Compile Include="Source\Services\ProgressTracking\ITrackedProcess.cs" />
-    <Compile Include="Source\Services\ProgressTracking\ProgressTrackingComponent.cs" />
-    <Compile Include="Source\Services\RepositoryTypeLister.cs" />
-    <Compile Include="Source\Services\RepositoryTypeLister.Test.cs">
-      <DependentUpon>RepositoryTypeLister.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Services\ServiceManager.Analyzer.cs">
-      <DependentUpon>ServiceManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Services\ServiceManager.cs" />
-    <Compile Include="Source\Services\ServiceManager.For.cs">
-      <DependentUpon>ServiceManager.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\IO\PartialStream.cs" />
     <Compile Include="Source\IO\PartialStream.Test.cs">
       <DependentUpon>PartialStream.cs</DependentUpon>
@@ -284,31 +239,6 @@
     <Compile Include="Source\Plugins\PluginRepository.Test.cs">
       <DependentUpon>PluginRepository.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Scheduling\AbortedException.cs" />
-    <Compile Include="Source\Scheduling\AbortedException.Test.cs">
-      <DependentUpon>AbortedException.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\IAbortable.cs" />
-    <Compile Include="Source\Scheduling\Operation.cs" />
-    <Compile Include="Source\Scheduling\Operation.Test.cs">
-      <DependentUpon>Operation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\OperationQueue.cs" />
-    <Compile Include="Source\Scheduling\OperationQueue.Test.cs">
-      <DependentUpon>OperationQueue.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadCallbackOperation.cs" />
-    <Compile Include="Source\Scheduling\ThreadCallbackOperation.Test.cs">
-      <DependentUpon>ThreadCallbackOperation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadOperation.cs" />
-    <Compile Include="Source\Scheduling\ThreadOperation.Test.cs">
-      <DependentUpon>ThreadOperation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Services\ServiceManager.Test.cs">
-      <DependentUpon>ServiceManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Services\ExplicitTypeLister.cs" />
     <Compile Include="Source\Shared.cs" />
     <Compile Include="Source\Shared.Test.cs">
       <DependentUpon>Shared.cs</DependentUpon>
@@ -329,48 +259,6 @@
     <Compile Include="Source\StringSegment.Test.cs">
       <DependentUpon>StringSegment.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Tracking\IdleStateEventArgs.cs" />
-    <Compile Include="Source\Tracking\IdleStateEventArgs.Test.cs">
-      <DependentUpon>IdleStateEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\ObservedWeightedTransaction.cs" />
-    <Compile Include="Source\Tracking\Internal\ObservedWeightedTransaction.Test.cs">
-      <DependentUpon>ObservedWeightedTransaction.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\WeightedTransactionWrapperCollection.cs" />
-    <Compile Include="Source\Tracking\Internal\WeightedTransactionWrapperCollection.Test.cs">
-      <DependentUpon>WeightedTransactionWrapperCollection.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\IProgressReporter.cs" />
-    <Compile Include="Source\Tracking\IStatusReporter.cs" />
-    <Compile Include="Source\Tracking\ProgressReportEventArgs.cs" />
-    <Compile Include="Source\Tracking\ProgressReportEventArgs.Test.cs">
-      <DependentUpon>ProgressReportEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\ProgressTracker.cs" />
-    <Compile Include="Source\Tracking\ProgressTracker.Test.cs">
-      <DependentUpon>ProgressTracker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Request.cs" />
-    <Compile Include="Source\Tracking\Request.Test.cs">
-      <DependentUpon>Request.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\StatusReportEventArgs.Test.cs">
-      <DependentUpon>StatusReportEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Transaction.Test.cs">
-      <DependentUpon>Transaction.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\TransactionGroup.cs" />
-    <Compile Include="Source\Tracking\TransactionGroup.Test.cs">
-      <DependentUpon>TransactionGroup.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\StatusReportEventArgs.cs" />
-    <Compile Include="Source\Tracking\Transaction.cs" />
-    <Compile Include="Source\Tracking\WeightedTransaction.cs" />
-    <Compile Include="Source\Tracking\WeightedTransaction.Test.cs">
-      <DependentUpon>WeightedTransaction.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\WeakReference.cs" />
     <Compile Include="Source\WeakReference.Phone7.cs">
       <DependentUpon>WeakReference.cs</DependentUpon>
diff --git a/Nuclex.Support (xna-4.0-phone7).csproj b/Nuclex.Support (xna-4.0-phone7).csproj
index 01bb5f8..ebcd888 100644
--- a/Nuclex.Support (xna-4.0-phone7).csproj	
+++ b/Nuclex.Support (xna-4.0-phone7).csproj	
@@ -181,23 +181,6 @@
     <Compile Include="Source\Plugins\PrototypeFactory.Test.cs">
       <DependentUpon>PrototypeFactory.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Scheduling\GenericTimeSource.Test.cs">
-      <DependentUpon>GenericTimeSource.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ISchedulerService.cs" />
-    <Compile Include="Source\Scheduling\ITimeSource.cs" />
-    <Compile Include="Source\Scheduling\Scheduler.cs" />
-    <Compile Include="Source\Scheduling\GenericTimeSource.cs" />
-    <Compile Include="Source\Scheduling\Scheduler.Test.cs">
-      <DependentUpon>Scheduler.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\Scheduler.TimeSource.cs">
-      <DependentUpon>Scheduler.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\WindowsTimeSource.cs" />
-    <Compile Include="Source\Scheduling\WindowsTimeSource.Test.cs">
-      <DependentUpon>WindowsTimeSource.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\Semaphore.cs" />
     <Compile Include="Source\Semaphore.Test.cs">
       <DependentUpon>Semaphore.cs</DependentUpon>
@@ -315,27 +298,6 @@
     <Compile Include="Source\Plugins\PluginRepository.Test.cs">
       <DependentUpon>PluginRepository.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Scheduling\AbortedException.cs" />
-    <Compile Include="Source\Scheduling\AbortedException.Test.cs">
-      <DependentUpon>AbortedException.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\IAbortable.cs" />
-    <Compile Include="Source\Scheduling\Operation.cs" />
-    <Compile Include="Source\Scheduling\Operation.Test.cs">
-      <DependentUpon>Operation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\OperationQueue.cs" />
-    <Compile Include="Source\Scheduling\OperationQueue.Test.cs">
-      <DependentUpon>OperationQueue.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadCallbackOperation.cs" />
-    <Compile Include="Source\Scheduling\ThreadCallbackOperation.Test.cs">
-      <DependentUpon>ThreadCallbackOperation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadOperation.cs" />
-    <Compile Include="Source\Scheduling\ThreadOperation.Test.cs">
-      <DependentUpon>ThreadOperation.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\Services\ServiceManager.Test.cs">
       <DependentUpon>ServiceManager.cs</DependentUpon>
     </Compile>
@@ -360,48 +322,6 @@
     <Compile Include="Source\StringSegment.Test.cs">
       <DependentUpon>StringSegment.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Tracking\IdleStateEventArgs.cs" />
-    <Compile Include="Source\Tracking\IdleStateEventArgs.Test.cs">
-      <DependentUpon>IdleStateEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\ObservedWeightedTransaction.cs" />
-    <Compile Include="Source\Tracking\Internal\ObservedWeightedTransaction.Test.cs">
-      <DependentUpon>ObservedWeightedTransaction.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\WeightedTransactionWrapperCollection.cs" />
-    <Compile Include="Source\Tracking\Internal\WeightedTransactionWrapperCollection.Test.cs">
-      <DependentUpon>WeightedTransactionWrapperCollection.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\IProgressReporter.cs" />
-    <Compile Include="Source\Tracking\IStatusReporter.cs" />
-    <Compile Include="Source\Tracking\ProgressReportEventArgs.cs" />
-    <Compile Include="Source\Tracking\ProgressReportEventArgs.Test.cs">
-      <DependentUpon>ProgressReportEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\ProgressTracker.cs" />
-    <Compile Include="Source\Tracking\ProgressTracker.Test.cs">
-      <DependentUpon>ProgressTracker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Request.cs" />
-    <Compile Include="Source\Tracking\Request.Test.cs">
-      <DependentUpon>Request.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\StatusReportEventArgs.Test.cs">
-      <DependentUpon>StatusReportEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Transaction.Test.cs">
-      <DependentUpon>Transaction.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\TransactionGroup.cs" />
-    <Compile Include="Source\Tracking\TransactionGroup.Test.cs">
-      <DependentUpon>TransactionGroup.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\StatusReportEventArgs.cs" />
-    <Compile Include="Source\Tracking\Transaction.cs" />
-    <Compile Include="Source\Tracking\WeightedTransaction.cs" />
-    <Compile Include="Source\Tracking\WeightedTransaction.Test.cs">
-      <DependentUpon>WeightedTransaction.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\WeakReference.cs" />
     <Compile Include="Source\WeakReference.Phone7.cs">
       <DependentUpon>WeakReference.cs</DependentUpon>
diff --git a/Nuclex.Support (xna-4.0-xbox360).csproj b/Nuclex.Support (xna-4.0-xbox360).csproj
index 10c8617..39e934d 100644
--- a/Nuclex.Support (xna-4.0-xbox360).csproj	
+++ b/Nuclex.Support (xna-4.0-xbox360).csproj	
@@ -192,23 +192,6 @@
     <Compile Include="Source\Plugins\PrototypeFactory.Test.cs">
       <DependentUpon>PrototypeFactory.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Scheduling\GenericTimeSource.Test.cs">
-      <DependentUpon>GenericTimeSource.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ISchedulerService.cs" />
-    <Compile Include="Source\Scheduling\ITimeSource.cs" />
-    <Compile Include="Source\Scheduling\Scheduler.cs" />
-    <Compile Include="Source\Scheduling\GenericTimeSource.cs" />
-    <Compile Include="Source\Scheduling\Scheduler.Test.cs">
-      <DependentUpon>Scheduler.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\Scheduler.TimeSource.cs">
-      <DependentUpon>Scheduler.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\WindowsTimeSource.cs" />
-    <Compile Include="Source\Scheduling\WindowsTimeSource.Test.cs">
-      <DependentUpon>WindowsTimeSource.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\Semaphore.cs" />
     <Compile Include="Source\Semaphore.Test.cs">
       <DependentUpon>Semaphore.cs</DependentUpon>
@@ -326,27 +309,6 @@
     <Compile Include="Source\Plugins\PluginRepository.Test.cs">
       <DependentUpon>PluginRepository.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Scheduling\AbortedException.cs" />
-    <Compile Include="Source\Scheduling\AbortedException.Test.cs">
-      <DependentUpon>AbortedException.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\IAbortable.cs" />
-    <Compile Include="Source\Scheduling\Operation.cs" />
-    <Compile Include="Source\Scheduling\Operation.Test.cs">
-      <DependentUpon>Operation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\OperationQueue.cs" />
-    <Compile Include="Source\Scheduling\OperationQueue.Test.cs">
-      <DependentUpon>OperationQueue.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadCallbackOperation.cs" />
-    <Compile Include="Source\Scheduling\ThreadCallbackOperation.Test.cs">
-      <DependentUpon>ThreadCallbackOperation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadOperation.cs" />
-    <Compile Include="Source\Scheduling\ThreadOperation.Test.cs">
-      <DependentUpon>ThreadOperation.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\Services\ServiceManager.Test.cs">
       <DependentUpon>ServiceManager.cs</DependentUpon>
     </Compile>
@@ -371,48 +333,6 @@
     <Compile Include="Source\StringSegment.Test.cs">
       <DependentUpon>StringSegment.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\Tracking\IdleStateEventArgs.cs" />
-    <Compile Include="Source\Tracking\IdleStateEventArgs.Test.cs">
-      <DependentUpon>IdleStateEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\ObservedWeightedTransaction.cs" />
-    <Compile Include="Source\Tracking\Internal\ObservedWeightedTransaction.Test.cs">
-      <DependentUpon>ObservedWeightedTransaction.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\WeightedTransactionWrapperCollection.cs" />
-    <Compile Include="Source\Tracking\Internal\WeightedTransactionWrapperCollection.Test.cs">
-      <DependentUpon>WeightedTransactionWrapperCollection.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\IProgressReporter.cs" />
-    <Compile Include="Source\Tracking\IStatusReporter.cs" />
-    <Compile Include="Source\Tracking\ProgressReportEventArgs.cs" />
-    <Compile Include="Source\Tracking\ProgressReportEventArgs.Test.cs">
-      <DependentUpon>ProgressReportEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\ProgressTracker.cs" />
-    <Compile Include="Source\Tracking\ProgressTracker.Test.cs">
-      <DependentUpon>ProgressTracker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Request.cs" />
-    <Compile Include="Source\Tracking\Request.Test.cs">
-      <DependentUpon>Request.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\StatusReportEventArgs.Test.cs">
-      <DependentUpon>StatusReportEventArgs.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\Transaction.Test.cs">
-      <DependentUpon>Transaction.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\TransactionGroup.cs" />
-    <Compile Include="Source\Tracking\TransactionGroup.Test.cs">
-      <DependentUpon>TransactionGroup.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\StatusReportEventArgs.cs" />
-    <Compile Include="Source\Tracking\Transaction.cs" />
-    <Compile Include="Source\Tracking\WeightedTransaction.cs" />
-    <Compile Include="Source\Tracking\WeightedTransaction.Test.cs">
-      <DependentUpon>WeightedTransaction.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\WeakReference.cs" />
     <Compile Include="Source\WeakReference.Phone7.cs">
       <DependentUpon>WeakReference.cs</DependentUpon>
diff --git a/Source/Services/ProgressTracking/IProgressCollectingService.cs b/Source/Services/ProgressTracking/IProgressCollectingService.cs
index 4556d7f..33a5339 100644
--- a/Source/Services/ProgressTracking/IProgressCollectingService.cs
+++ b/Source/Services/ProgressTracking/IProgressCollectingService.cs
@@ -18,13 +18,13 @@ License along with this library
 */
 #endregion
 
+#if ENABLE_SERVICEMANAGER
+
 using System;
 using System.Collections.Generic;
 
 using Nuclex.Support.Tracking;
 
-#if ENABLE_SERVICEMANAGER
-
 namespace Nuclex.Support.Services.ProgressTracking {
 
   /// <summary>Allows application-wide tracking of progress</summary>
diff --git a/Source/Services/ProgressTracking/IProgressPublishingService.cs b/Source/Services/ProgressTracking/IProgressPublishingService.cs
index 72ad5ee..26cc70a 100644
--- a/Source/Services/ProgressTracking/IProgressPublishingService.cs
+++ b/Source/Services/ProgressTracking/IProgressPublishingService.cs
@@ -18,13 +18,13 @@ License along with this library
 */
 #endregion
 
+#if ENABLE_SERVICEMANAGER
+
 using System;
 using System.Collections.Generic;
 
 using Nuclex.Support.Tracking;
 
-#if ENABLE_SERVICEMANAGER
-
 namespace Nuclex.Support.Services.ProgressTracking {
 
   /// <summary>Reports the progress of tracked background processes</summary>
diff --git a/Source/Services/ProgressTracking/ITrackedProcess.cs b/Source/Services/ProgressTracking/ITrackedProcess.cs
index cb55f8f..d4d5526 100644
--- a/Source/Services/ProgressTracking/ITrackedProcess.cs
+++ b/Source/Services/ProgressTracking/ITrackedProcess.cs
@@ -18,13 +18,13 @@ License along with this library
 */
 #endregion
 
+#if ENABLE_SERVICEMANAGER
+
 using System;
 using System.Collections.Generic;
 
 using Nuclex.Support.Tracking;
 
-#if ENABLE_SERVICEMANAGER
-
 namespace Nuclex.Support.Services.ProgressTracking {
 
   /// <summary>Process whose progress is being tracked</summary>
diff --git a/Source/Services/ProgressTracking/ProgressTrackingComponent.cs b/Source/Services/ProgressTracking/ProgressTrackingComponent.cs
index 078520a..6e1506e 100644
--- a/Source/Services/ProgressTracking/ProgressTrackingComponent.cs
+++ b/Source/Services/ProgressTracking/ProgressTrackingComponent.cs
@@ -18,13 +18,13 @@ License along with this library
 */
 #endregion
 
+#if ENABLE_SERVICEMANAGER
+
 using System;
 using System.Collections.Generic;
 
 using Nuclex.Support.Tracking;
 
-#if ENABLE_SERVICEMANAGER
-
 namespace Nuclex.Support.Services.ProgressTracking {
 
   /// <summary>Tracks the progress of running background processes</summary>