diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index b64a254335..e118c2b62e 100755
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA
 {
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 0f3d6093f7..d2acfc6fa6 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -148,7 +148,7 @@
     <Compile Include="Support\Program.cs" />
     <Compile Include="Sync.cs" />
     <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\Activities\Activity.cs" />
+    <Compile Include="Traits\Activity.cs" />
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Traits\DrawLineToTarget.cs" />
     <Compile Include="Traits\EditorAppearance.cs" />
@@ -237,4 +237,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/OpenRA.Game/Traits/Activities/Activity.cs b/OpenRA.Game/Traits/Activity.cs
old mode 100755
new mode 100644
similarity index 69%
rename from OpenRA.Game/Traits/Activities/Activity.cs
rename to OpenRA.Game/Traits/Activity.cs
index 9772e1c98e..528e7c592c
--- a/OpenRA.Game/Traits/Activities/Activity.cs
+++ b/OpenRA.Game/Traits/Activity.cs
@@ -1,9 +1,19 @@
-using System;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Traits
 {
 	public abstract class Activity
 	{
diff --git a/OpenRA.Game/Traits/Util.cs b/OpenRA.Game/Traits/Util.cs
index 26a1a4ab54..5c65ba6024 100755
--- a/OpenRA.Game/Traits/Util.cs
+++ b/OpenRA.Game/Traits/Util.cs
@@ -13,7 +13,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Support;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
diff --git a/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs b/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
index 110a09bf90..7cf0efcbb0 100644
--- a/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
+++ b/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
@@ -15,22 +15,12 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.Cnc
 {
 	public class HarvesterDockSequence : Activity
 	{
-		enum State
-		{
-			Wait,
-			Turn,
-			Dragin,
-			Dock,
-			Loop,
-			Undock,
-			Dragout
-		};
+		enum State { Wait, Turn, DragIn, Dock, Loop, Undock, DragOut };
 
 		readonly Actor proc;
 		readonly Harvester harv;
@@ -56,9 +46,9 @@ namespace OpenRA.Mods.Cnc
 				case State.Wait:
 					return this;
 				case State.Turn:
-					state = State.Dragin;
+					state = State.DragIn;
 					return Util.SequenceActivities(new Turn(112), this);
-				case State.Dragin:
+				case State.DragIn:
 					state = State.Dock;
 					return Util.SequenceActivities(new Drag(startDock, endDock, 12), this);
 				case State.Dock:
@@ -70,10 +60,10 @@ namespace OpenRA.Mods.Cnc
 						state = State.Undock;
 					return this;
 				case State.Undock:
-					ru.PlayCustomAnimBackwards(self, "dock", () => state = State.Dragout);
+					ru.PlayCustomAnimBackwards(self, "dock", () => state = State.DragOut);
 					state = State.Wait;
 					return this;
-				case State.Dragout:
+				case State.DragOut:
 					return Util.SequenceActivities(new Drag(endDock, startDock, 12), NextActivity);
 			}
 			throw new InvalidOperationException("Invalid harvester dock state");
diff --git a/OpenRA.Mods.Cnc/TiberiumRefinery.cs b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
index b53ac6136b..63d923b77d 100644
--- a/OpenRA.Mods.Cnc/TiberiumRefinery.cs
+++ b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
@@ -8,10 +8,8 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using OpenRA.Mods.RA;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.Cnc
 {
diff --git a/OpenRA.Mods.RA/Activities/Attack.cs b/OpenRA.Mods.RA/Activities/Attack.cs
index 9f830960a2..fbd081c2bb 100755
--- a/OpenRA.Mods.RA/Activities/Attack.cs
+++ b/OpenRA.Mods.RA/Activities/Attack.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/CallFunc.cs b/OpenRA.Mods.RA/Activities/CallFunc.cs
index c35b3ed193..24b74e095f 100644
--- a/OpenRA.Mods.RA/Activities/CallFunc.cs
+++ b/OpenRA.Mods.RA/Activities/CallFunc.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/CaptureActor.cs b/OpenRA.Mods.RA/Activities/CaptureActor.cs
index 727ffadc67..d123520148 100644
--- a/OpenRA.Mods.RA/Activities/CaptureActor.cs
+++ b/OpenRA.Mods.RA/Activities/CaptureActor.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/DeliverResources.cs b/OpenRA.Mods.RA/Activities/DeliverResources.cs
index 4257f8d8cf..6a83cf53df 100755
--- a/OpenRA.Mods.RA/Activities/DeliverResources.cs
+++ b/OpenRA.Mods.RA/Activities/DeliverResources.cs
@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Demolish.cs b/OpenRA.Mods.RA/Activities/Demolish.cs
index e908435fec..d42ccd8cc9 100644
--- a/OpenRA.Mods.RA/Activities/Demolish.cs
+++ b/OpenRA.Mods.RA/Activities/Demolish.cs
@@ -11,7 +11,6 @@
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/DonateSupplies.cs b/OpenRA.Mods.RA/Activities/DonateSupplies.cs
index 38c4e9f572..4e68edbea5 100644
--- a/OpenRA.Mods.RA/Activities/DonateSupplies.cs
+++ b/OpenRA.Mods.RA/Activities/DonateSupplies.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Effects;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Enter.cs b/OpenRA.Mods.RA/Activities/Enter.cs
index 2a7f4ce093..75c6c27d3b 100755
--- a/OpenRA.Mods.RA/Activities/Enter.cs
+++ b/OpenRA.Mods.RA/Activities/Enter.cs
@@ -8,12 +8,8 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/EnterTransport.cs b/OpenRA.Mods.RA/Activities/EnterTransport.cs
index 7779e73789..3ccf076ca6 100644
--- a/OpenRA.Mods.RA/Activities/EnterTransport.cs
+++ b/OpenRA.Mods.RA/Activities/EnterTransport.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/FindResources.cs b/OpenRA.Mods.RA/Activities/FindResources.cs
index 2e6e3320d5..2a683f837e 100755
--- a/OpenRA.Mods.RA/Activities/FindResources.cs
+++ b/OpenRA.Mods.RA/Activities/FindResources.cs
@@ -8,13 +8,12 @@
  */
 #endregion
 
-using System.Linq;
-using System.Drawing;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using OpenRA.Mods.RA.Move;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Follow.cs b/OpenRA.Mods.RA/Activities/Follow.cs
index 85d755bbb5..b9140b7102 100644
--- a/OpenRA.Mods.RA/Activities/Follow.cs
+++ b/OpenRA.Mods.RA/Activities/Follow.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Heal.cs b/OpenRA.Mods.RA/Activities/Heal.cs
index b9f29d36d8..0861e56c54 100755
--- a/OpenRA.Mods.RA/Activities/Heal.cs
+++ b/OpenRA.Mods.RA/Activities/Heal.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.RA/Activities/Infiltrate.cs
index dd59d2c5aa..045969ef02 100644
--- a/OpenRA.Mods.RA/Activities/Infiltrate.cs
+++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/LayMines.cs b/OpenRA.Mods.RA/Activities/LayMines.cs
index 98ee307b1b..9bb861737b 100644
--- a/OpenRA.Mods.RA/Activities/LayMines.cs
+++ b/OpenRA.Mods.RA/Activities/LayMines.cs
@@ -11,7 +11,6 @@
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Move;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Leap.cs b/OpenRA.Mods.RA/Activities/Leap.cs
index a403bb227f..6ede865d88 100644
--- a/OpenRA.Mods.RA/Activities/Leap.cs
+++ b/OpenRA.Mods.RA/Activities/Leap.cs
@@ -9,10 +9,9 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Render;
 using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/MakeAnimation.cs b/OpenRA.Mods.RA/Activities/MakeAnimation.cs
index ea3eb0026d..c69138387a 100644
--- a/OpenRA.Mods.RA/Activities/MakeAnimation.cs
+++ b/OpenRA.Mods.RA/Activities/MakeAnimation.cs
@@ -8,12 +8,10 @@
  */
 #endregion
 
-using OpenRA.FileFormats;
+using System;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System;
 
 namespace OpenRA.Mods.RA.Activities
 {
@@ -32,6 +30,7 @@ namespace OpenRA.Mods.RA.Activities
 
 		bool complete = false;
 		bool started = false;
+
 		public override Activity Tick( Actor self )
 		{
 			if (started)
diff --git a/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs b/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
index e872ae3a99..93f1c0e553 100755
--- a/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
+++ b/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
@@ -8,12 +8,8 @@
  */
 #endregion
 
-using System.Collections.Generic;
-using System.Linq;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using OpenRA.FileFormats;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs b/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
index f0abb69307..d64de01fcd 100644
--- a/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
+++ b/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
@@ -8,27 +8,17 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System.Collections.Generic;
-using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Render;
 using System;
+using System.Collections.Generic;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
 	public class RAHarvesterDockSequence : Activity
 	{
-		enum State
-		{
-			Wait,
-			Turn,
-			Dock,
-			Loop,
-			Undock,
-			Complete
-		};
+		enum State { Wait, Turn, Dock, Loop, Undock, Complete };
 
 		readonly Actor proc;
 		readonly Harvester harv;
diff --git a/OpenRA.Mods.RA/Activities/Rearm.cs b/OpenRA.Mods.RA/Activities/Rearm.cs
index 0191245917..6f32eb3c1f 100644
--- a/OpenRA.Mods.RA/Activities/Rearm.cs
+++ b/OpenRA.Mods.RA/Activities/Rearm.cs
@@ -11,7 +11,6 @@
 using System.Linq;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/RemoveSelf.cs b/OpenRA.Mods.RA/Activities/RemoveSelf.cs
index 2f0aa1c44b..dc25fb2231 100755
--- a/OpenRA.Mods.RA/Activities/RemoveSelf.cs
+++ b/OpenRA.Mods.RA/Activities/RemoveSelf.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Repair.cs b/OpenRA.Mods.RA/Activities/Repair.cs
index e83cdd2709..ef988dcd21 100644
--- a/OpenRA.Mods.RA/Activities/Repair.cs
+++ b/OpenRA.Mods.RA/Activities/Repair.cs
@@ -11,7 +11,6 @@
 using System;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/RepairBuilding.cs b/OpenRA.Mods.RA/Activities/RepairBuilding.cs
index f3450b0a63..54ffdcad37 100644
--- a/OpenRA.Mods.RA/Activities/RepairBuilding.cs
+++ b/OpenRA.Mods.RA/Activities/RepairBuilding.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Sell.cs b/OpenRA.Mods.RA/Activities/Sell.cs
index 8a18578bee..5d859f99af 100755
--- a/OpenRA.Mods.RA/Activities/Sell.cs
+++ b/OpenRA.Mods.RA/Activities/Sell.cs
@@ -11,7 +11,6 @@
 using System.Collections.Generic;
 using OpenRA.Traits;
 using OpenRA.Mods.RA.Effects;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Buildings;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Teleport.cs b/OpenRA.Mods.RA/Activities/Teleport.cs
index 559d7f4200..b3275532a3 100755
--- a/OpenRA.Mods.RA/Activities/Teleport.cs
+++ b/OpenRA.Mods.RA/Activities/Teleport.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Transform.cs b/OpenRA.Mods.RA/Activities/Transform.cs
index 3336124751..4584221930 100644
--- a/OpenRA.Mods.RA/Activities/Transform.cs
+++ b/OpenRA.Mods.RA/Activities/Transform.cs
@@ -12,7 +12,6 @@ using OpenRA.FileFormats;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Turn.cs b/OpenRA.Mods.RA/Activities/Turn.cs
index 0140b10c77..83d7d2016f 100755
--- a/OpenRA.Mods.RA/Activities/Turn.cs
+++ b/OpenRA.Mods.RA/Activities/Turn.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/UnloadCargo.cs b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
index 23f9fe8819..9c57f66649 100644
--- a/OpenRA.Mods.RA/Activities/UnloadCargo.cs
+++ b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
@@ -8,12 +8,11 @@
  */
 #endregion
 
+using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System.Drawing;
-using OpenRA.Mods.RA.Move;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Wait.cs b/OpenRA.Mods.RA/Activities/Wait.cs
index eb66cd697b..b58fb7de63 100644
--- a/OpenRA.Mods.RA/Activities/Wait.cs
+++ b/OpenRA.Mods.RA/Activities/Wait.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Air/AttackHeli.cs b/OpenRA.Mods.RA/Air/AttackHeli.cs
index e0704dc6f3..b3eac90faa 100755
--- a/OpenRA.Mods.RA/Air/AttackHeli.cs
+++ b/OpenRA.Mods.RA/Air/AttackHeli.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/AttackPlane.cs b/OpenRA.Mods.RA/Air/AttackPlane.cs
index cdbd9a0be1..b23da20bd6 100755
--- a/OpenRA.Mods.RA/Air/AttackPlane.cs
+++ b/OpenRA.Mods.RA/Air/AttackPlane.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/FallsToEarth.cs b/OpenRA.Mods.RA/Air/FallsToEarth.cs
index 8071fddf52..1fbdb42293 100755
--- a/OpenRA.Mods.RA/Air/FallsToEarth.cs
+++ b/OpenRA.Mods.RA/Air/FallsToEarth.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/Fly.cs b/OpenRA.Mods.RA/Air/Fly.cs
index f8df421747..470e473fa1 100755
--- a/OpenRA.Mods.RA/Air/Fly.cs
+++ b/OpenRA.Mods.RA/Air/Fly.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/FlyAttack.cs b/OpenRA.Mods.RA/Air/FlyAttack.cs
index 9086ee23f7..efc7f68547 100755
--- a/OpenRA.Mods.RA/Air/FlyAttack.cs
+++ b/OpenRA.Mods.RA/Air/FlyAttack.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/FlyCircle.cs b/OpenRA.Mods.RA/Air/FlyCircle.cs
index ee6bfe66c1..9b3a889440 100644
--- a/OpenRA.Mods.RA/Air/FlyCircle.cs
+++ b/OpenRA.Mods.RA/Air/FlyCircle.cs
@@ -10,7 +10,6 @@
 
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/FlyTimed.cs b/OpenRA.Mods.RA/Air/FlyTimed.cs
index 761837e1a6..7968d5a9d7 100755
--- a/OpenRA.Mods.RA/Air/FlyTimed.cs
+++ b/OpenRA.Mods.RA/Air/FlyTimed.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/HeliAttack.cs b/OpenRA.Mods.RA/Air/HeliAttack.cs
index cb12843e33..bfe3f19a27 100755
--- a/OpenRA.Mods.RA/Air/HeliAttack.cs
+++ b/OpenRA.Mods.RA/Air/HeliAttack.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/HeliFly.cs b/OpenRA.Mods.RA/Air/HeliFly.cs
index 7a5e080c77..c96a7b0c24 100755
--- a/OpenRA.Mods.RA/Air/HeliFly.cs
+++ b/OpenRA.Mods.RA/Air/HeliFly.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/HeliLand.cs b/OpenRA.Mods.RA/Air/HeliLand.cs
index c91787bcfa..18fe3558be 100755
--- a/OpenRA.Mods.RA/Air/HeliLand.cs
+++ b/OpenRA.Mods.RA/Air/HeliLand.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/HeliReturn.cs b/OpenRA.Mods.RA/Air/HeliReturn.cs
index 6251057020..57698a3ef0 100755
--- a/OpenRA.Mods.RA/Air/HeliReturn.cs
+++ b/OpenRA.Mods.RA/Air/HeliReturn.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Activities;
 
 namespace OpenRA.Mods.RA.Air
diff --git a/OpenRA.Mods.RA/Air/Land.cs b/OpenRA.Mods.RA/Air/Land.cs
index e5cc46a90b..a55f4d3259 100755
--- a/OpenRA.Mods.RA/Air/Land.cs
+++ b/OpenRA.Mods.RA/Air/Land.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/Plane.cs b/OpenRA.Mods.RA/Air/Plane.cs
index e630186642..cb93c14de2 100755
--- a/OpenRA.Mods.RA/Air/Plane.cs
+++ b/OpenRA.Mods.RA/Air/Plane.cs
@@ -11,7 +11,6 @@
 using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Air
 {
diff --git a/OpenRA.Mods.RA/Air/ReturnToBase.cs b/OpenRA.Mods.RA/Air/ReturnToBase.cs
index 4270265d09..27241609e2 100755
--- a/OpenRA.Mods.RA/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.RA/Air/ReturnToBase.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Buildings;
 
 namespace OpenRA.Mods.RA.Air
diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs
index b5408ff812..3c7d7eff02 100644
--- a/OpenRA.Mods.RA/Attack/AttackBase.cs
+++ b/OpenRA.Mods.RA/Attack/AttackBase.cs
@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackFrontal.cs b/OpenRA.Mods.RA/Attack/AttackFrontal.cs
index 0cedc7a0f7..95a6876625 100644
--- a/OpenRA.Mods.RA/Attack/AttackFrontal.cs
+++ b/OpenRA.Mods.RA/Attack/AttackFrontal.cs
@@ -10,7 +10,6 @@
 
 using System;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackLeap.cs b/OpenRA.Mods.RA/Attack/AttackLeap.cs
index 0c4edaafdd..e197c94542 100644
--- a/OpenRA.Mods.RA/Attack/AttackLeap.cs
+++ b/OpenRA.Mods.RA/Attack/AttackLeap.cs
@@ -11,7 +11,6 @@
 using System;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackMedic.cs b/OpenRA.Mods.RA/Attack/AttackMedic.cs
index 8f6da418a1..142393d902 100644
--- a/OpenRA.Mods.RA/Attack/AttackMedic.cs
+++ b/OpenRA.Mods.RA/Attack/AttackMedic.cs
@@ -10,7 +10,6 @@
 
 using System;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackOmni.cs b/OpenRA.Mods.RA/Attack/AttackOmni.cs
index 401e2b9155..ef099a4fcb 100644
--- a/OpenRA.Mods.RA/Attack/AttackOmni.cs
+++ b/OpenRA.Mods.RA/Attack/AttackOmni.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
index 7405891d76..a9181b5005 100644
--- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
+++ b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
@@ -8,15 +8,10 @@
  */
 #endregion
 
-using System;
-using System.Linq;
 using OpenRA.GameRules;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackTesla.cs b/OpenRA.Mods.RA/Attack/AttackTesla.cs
index b1168e81c9..9a82355851 100644
--- a/OpenRA.Mods.RA/Attack/AttackTesla.cs
+++ b/OpenRA.Mods.RA/Attack/AttackTesla.cs
@@ -11,7 +11,6 @@
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackTurreted.cs b/OpenRA.Mods.RA/Attack/AttackTurreted.cs
index 16ccb059a2..b33b740e67 100644
--- a/OpenRA.Mods.RA/Attack/AttackTurreted.cs
+++ b/OpenRA.Mods.RA/Attack/AttackTurreted.cs
@@ -14,7 +14,6 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Attack/AttackWander.cs b/OpenRA.Mods.RA/Attack/AttackWander.cs
index 2d073e8125..7171ab09dd 100644
--- a/OpenRA.Mods.RA/Attack/AttackWander.cs
+++ b/OpenRA.Mods.RA/Attack/AttackWander.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using System.Drawing;
 using OpenRA.Mods.RA.Move;
 
diff --git a/OpenRA.Mods.RA/AttackMove.cs b/OpenRA.Mods.RA/AttackMove.cs
index f70f54c710..40ae1043c7 100644
--- a/OpenRA.Mods.RA/AttackMove.cs
+++ b/OpenRA.Mods.RA/AttackMove.cs
@@ -12,7 +12,6 @@ using System.Drawing;
 using OpenRA.Effects;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/AutoHeal.cs b/OpenRA.Mods.RA/AutoHeal.cs
index ec211dc8c0..5b2e1c031b 100644
--- a/OpenRA.Mods.RA/AutoHeal.cs
+++ b/OpenRA.Mods.RA/AutoHeal.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs
index 2e55548538..127742bf83 100644
--- a/OpenRA.Mods.RA/AutoTarget.cs
+++ b/OpenRA.Mods.RA/AutoTarget.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using System.Drawing;
 using System.Linq;
 
diff --git a/OpenRA.Mods.RA/FreeActor.cs b/OpenRA.Mods.RA/FreeActor.cs
index 942964989b..a9a0e45d82 100644
--- a/OpenRA.Mods.RA/FreeActor.cs
+++ b/OpenRA.Mods.RA/FreeActor.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.FileFormats;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Husk.cs b/OpenRA.Mods.RA/Husk.cs
index 013d61e3bf..710607b7da 100644
--- a/OpenRA.Mods.RA/Husk.cs
+++ b/OpenRA.Mods.RA/Husk.cs
@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
 using OpenRA.Mods.RA.Move;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Move/Drag.cs b/OpenRA.Mods.RA/Move/Drag.cs
index e5608344de..f58eb4c818 100755
--- a/OpenRA.Mods.RA/Move/Drag.cs
+++ b/OpenRA.Mods.RA/Move/Drag.cs
@@ -10,7 +10,6 @@
 
 using System.Collections.Generic;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Move
 {
diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs
index ef2f15f3b6..e66c7ea075 100755
--- a/OpenRA.Mods.RA/Move/Mobile.cs
+++ b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -15,7 +15,6 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Move
 {
diff --git a/OpenRA.Mods.RA/Move/Move.cs b/OpenRA.Mods.RA/Move/Move.cs
index b409dc119a..fb4ecbcd5d 100755
--- a/OpenRA.Mods.RA/Move/Move.cs
+++ b/OpenRA.Mods.RA/Move/Move.cs
@@ -15,7 +15,6 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Move
 {
diff --git a/OpenRA.Mods.RA/OreRefinery.cs b/OpenRA.Mods.RA/OreRefinery.cs
index 996a1039ab..036e46d08c 100644
--- a/OpenRA.Mods.RA/OreRefinery.cs
+++ b/OpenRA.Mods.RA/OreRefinery.cs
@@ -9,14 +9,11 @@
 #endregion
 
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Effects;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.RA/Render/RenderInfantry.cs
index 26a3586477..f8d467ba67 100644
--- a/OpenRA.Mods.RA/Render/RenderInfantry.cs
+++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs
@@ -10,7 +10,6 @@
 
 using OpenRA.Mods.RA.Effects;
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;
 
diff --git a/OpenRA.Mods.RA/ScaredyCat.cs b/OpenRA.Mods.RA/ScaredyCat.cs
index d4203dc362..9eded38312 100644
--- a/OpenRA.Mods.RA/ScaredyCat.cs
+++ b/OpenRA.Mods.RA/ScaredyCat.cs
@@ -8,11 +8,9 @@
  */
 #endregion
 
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-using System.Drawing;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/Spy.cs b/OpenRA.Mods.RA/Spy.cs
index 4fad953cee..54ec5b6706 100644
--- a/OpenRA.Mods.RA/Spy.cs
+++ b/OpenRA.Mods.RA/Spy.cs
@@ -13,9 +13,8 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Orders;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
index 7d35e51a3c..ff9e7680a2 100755
--- a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
@@ -8,12 +8,10 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Orders;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 using OpenRA.FileFormats;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Air;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {