diff --git a/OpenRA.Game/Exts.cs b/OpenRA.Game/Exts.cs
index 0150dd7662..3a20197ceb 100755
--- a/OpenRA.Game/Exts.cs
+++ b/OpenRA.Game/Exts.cs
@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Support;
-using OpenRA.Traits;
 
 namespace OpenRA
 {
diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs
index 7942b77cab..f590d22948 100755
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -13,7 +13,6 @@ using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Support;
 
 namespace OpenRA
 {
diff --git a/OpenRA.Renderer.Null/NullIndexBuffer.cs b/OpenRA.Renderer.Null/NullIndexBuffer.cs
index d951c4cdd0..723f64b297 100644
--- a/OpenRA.Renderer.Null/NullIndexBuffer.cs
+++ b/OpenRA.Renderer.Null/NullIndexBuffer.cs
@@ -1,17 +1,20 @@
-using OpenRA.FileFormats.Graphics;
+#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 OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Renderer.Null
 {
 	public class NullIndexBuffer : IIndexBuffer
 	{
-		public void Bind()
-		{
-
-		}
-
-		public void SetData(ushort[] indices, int length)
-		{
-
-		}
+		public void Bind() {}
+		public void SetData(ushort[] indices, int length) {}
 	}
 }
diff --git a/OpenRA.Renderer.Null/NullShader.cs b/OpenRA.Renderer.Null/NullShader.cs
index 8deaa123c7..468b63caba 100644
--- a/OpenRA.Renderer.Null/NullShader.cs
+++ b/OpenRA.Renderer.Null/NullShader.cs
@@ -1,25 +1,23 @@
-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;
 using OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Renderer.Null
 {
 	public class NullShader : IShader
 	{
-		public void SetValue(string name, float x, float y)
-		{
-			
-		}
-
-		public void SetValue(string param, ITexture texture)
-		{
-		}
-
-		public void Commit()
-		{
-		}
-
-		public void Render(Action a)
-		{
-		}
+		public void SetValue(string name, float x, float y) { }
+		public void SetValue(string param, ITexture texture) { }
+		public void Commit() { }
+		public void Render(Action a) { }
 	}
 }
diff --git a/OpenRA.Renderer.Null/NullTexture.cs b/OpenRA.Renderer.Null/NullTexture.cs
index 9a6caeda65..e22907a1d6 100644
--- a/OpenRA.Renderer.Null/NullTexture.cs
+++ b/OpenRA.Renderer.Null/NullTexture.cs
@@ -1,21 +1,22 @@
-using System.Drawing;
+#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.FileFormats.Graphics;
 
 namespace OpenRA.Renderer.Null
 {
 	public class NullTexture : ITexture
 	{
-		public void SetData(Bitmap bitmap)
-		{
-			
-		}
-
-		public void SetData(uint[,] colors)
-		{
-		}
-
-		public void SetData(byte[] colors, int width, int height)
-		{
-		}
+		public void SetData(Bitmap bitmap) { }
+		public void SetData(uint[,] colors) { }
+		public void SetData(byte[] colors, int width, int height) { }
 	}
 }
diff --git a/OpenRA.Renderer.Null/NullVertexBuffer.cs b/OpenRA.Renderer.Null/NullVertexBuffer.cs
index 49ed5e83e3..f6f0bd555c 100644
--- a/OpenRA.Renderer.Null/NullVertexBuffer.cs
+++ b/OpenRA.Renderer.Null/NullVertexBuffer.cs
@@ -1,17 +1,20 @@
-using OpenRA.FileFormats.Graphics;
+#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 OpenRA.FileFormats.Graphics;
 
 namespace OpenRA.Renderer.Null
 {
 	class NullVertexBuffer<T> : IVertexBuffer<T>
 	{
-		public void Bind()
-		{
-			
-		}
-
-		public void SetData(T[] vertices, int length)
-		{
-
-		}
+		public void Bind() { }
+		public void SetData(T[] vertices, int length) { }
 	}
 }