diff --git a/OpenRA.Mods.RA/Activities/AttackMove.cs b/OpenRA.Mods.RA/Activities/AttackMove.cs
deleted file mode 100644
index 003b2f9b0c..0000000000
--- a/OpenRA.Mods.RA/Activities/AttackMove.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRA.Traits;
-using OpenRA.Traits.Activities;
-
-namespace OpenRA.Mods.RA.Activities
-{
-	public class AttackMove : Move
-	{
-		public AttackMove(int2 destination) : base(destination) { }
-		public AttackMove(int2 destination, int nearEnough) : base(destination, nearEnough) { }
-		public AttackMove(int2 destination, Actor ignoreBuilding) : base(destination, ignoreBuilding) { }
-		public AttackMove(Actor target, int range) : base(target, range) { }
-		public AttackMove(Target target, int range) : base(target, range) { }
-		public AttackMove(Func<List<int2>> getPath) : base(getPath) { }
-	}
-}
diff --git a/OpenRA.Mods.RA/AttackMoveTrait.cs b/OpenRA.Mods.RA/AttackMove.cs
similarity index 81%
rename from OpenRA.Mods.RA/AttackMoveTrait.cs
rename to OpenRA.Mods.RA/AttackMove.cs
index 386ca757d5..4a02936a96 100644
--- a/OpenRA.Mods.RA/AttackMoveTrait.cs
+++ b/OpenRA.Mods.RA/AttackMove.cs
@@ -1,13 +1,21 @@
-using System;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 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 LICENSE.
+ */
+#endregion
+
 using System.Drawing;
-using OpenRA.Traits;
 using OpenRA.Effects;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
 	class AttackMoveInfo : TraitInfo<AttackMove>
 	{
-		//public object Create(ActorInitializer init) { return new AttackMove(init.self); }
 		public readonly bool JustMove = false;
 	}
 
@@ -18,9 +26,8 @@ namespace OpenRA.Mods.RA
 		public string VoicePhraseForOrder(Actor self, Order order)
 		{
 			if (order.OrderString == "AttackMove")
-			{
 				return "AttackMove";
-			}
+
 			return null;
 		}
 
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index d988efa8db..cf7d5f081d 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -77,7 +77,7 @@
     <Compile Include="Activities\UnloadCargo.cs" />
     <Compile Include="Activities\Wait.cs" />
     <Compile Include="AttackBase.cs" />
-    <Compile Include="AttackMoveTrait.cs" />
+    <Compile Include="AttackMove.cs" />
     <Compile Include="Buildable.cs" />
     <Compile Include="Combat.cs" />
     <Compile Include="Crates\CloakCrateAction.cs" />