diff --git a/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs b/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
index beb79b8f18..3c807d4810 100755
--- a/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
+++ b/OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
@@ -37,8 +37,6 @@ namespace OpenRA.FileFormats.Graphics
 
 		Size WindowSize { get; }
 
-		void Begin();
-		void End();
 		void Clear( Color color );
 		void Present( IInputHandler inputHandler );
 
diff --git a/OpenRA.Game/Graphics/Renderer.cs b/OpenRA.Game/Graphics/Renderer.cs
index 0318ded34a..ec22049049 100644
--- a/OpenRA.Game/Graphics/Renderer.cs
+++ b/OpenRA.Game/Graphics/Renderer.cs
@@ -9,14 +9,14 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
+using System.Windows.Forms;
 using OpenRA.FileFormats;
 using OpenRA.FileFormats.Graphics;
 using OpenRA.Support;
-using System.Windows.Forms;
-using System.Collections.Generic;
 
 namespace OpenRA.Graphics
 {
@@ -71,7 +71,6 @@ namespace OpenRA.Graphics
 
 		public void BeginFrame(float2 scroll)
 		{
-			device.Begin();
 			device.Clear(Color.Black);
 
 			float2 r1 = new float2(2f/Resolution.Width, -2f/Resolution.Height);
@@ -95,7 +94,6 @@ namespace OpenRA.Graphics
 		public void EndFrame( IInputHandler inputHandler )
 		{
 			Flush();
-			device.End();
 			device.Present( inputHandler );
 		}
 
diff --git a/OpenRA.Game/InputHandler.cs b/OpenRA.Game/InputHandler.cs
index a938777587..e49dc01149 100755
--- a/OpenRA.Game/InputHandler.cs
+++ b/OpenRA.Game/InputHandler.cs
@@ -8,13 +8,7 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
 using OpenRA.Widgets;
-using OpenRA.Network;
 
 namespace OpenRA
 {
diff --git a/OpenRA.Game/ObjectCreator.cs b/OpenRA.Game/ObjectCreator.cs
index bdc2337af7..24ad6daeff 100755
--- a/OpenRA.Game/ObjectCreator.cs
+++ b/OpenRA.Game/ObjectCreator.cs
@@ -1,9 +1,19 @@
-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 System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using OpenRA.FileFormats;
-using System.Collections.Generic;
 
 namespace OpenRA
 {
diff --git a/OpenRA.Game/Server/IServerExtension.cs b/OpenRA.Game/Server/IServerExtension.cs
index 6742a825b6..9cdd3b0330 100644
--- a/OpenRA.Game/Server/IServerExtension.cs
+++ b/OpenRA.Game/Server/IServerExtension.cs
@@ -1,4 +1,14 @@
-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.Network;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Game/Server/NullServerExtension.cs b/OpenRA.Game/Server/NullServerExtension.cs
index 1b6cb79585..06c1497080 100644
--- a/OpenRA.Game/Server/NullServerExtension.cs
+++ b/OpenRA.Game/Server/NullServerExtension.cs
@@ -1,4 +1,14 @@
-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.Network;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Gl/GraphicsDevice.cs b/OpenRA.Gl/GraphicsDevice.cs
index 7cd548e67c..bc0986f0df 100755
--- a/OpenRA.Gl/GraphicsDevice.cs
+++ b/OpenRA.Gl/GraphicsDevice.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Drawing;
 using System.IO;
-using System.Windows.Forms;
 using OpenRA.FileFormats.Graphics;
 using Tao.Cg;
 using Tao.OpenGl;
@@ -128,9 +127,6 @@ namespace OpenRA.GlRenderer
 			CheckGlError();
 		}
 
-		public void Begin() { }
-		public void End() { }
-
 		public void Clear( Color c )
 		{
 			Gl.glClearColor( 0, 0, 0, 0 );
diff --git a/OpenRA.Renderer.Null/NullGraphicsDevice.cs b/OpenRA.Renderer.Null/NullGraphicsDevice.cs
index 4bab36e51a..f187038c66 100644
--- a/OpenRA.Renderer.Null/NullGraphicsDevice.cs
+++ b/OpenRA.Renderer.Null/NullGraphicsDevice.cs
@@ -1,4 +1,14 @@
-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 System.IO;
 using OpenRA.FileFormats.Graphics;
 using OpenRA.Graphics;
@@ -19,8 +29,6 @@ namespace OpenRA.Renderer.Null
 		public void EnableScissor(int left, int top, int width, int height) { }
 		public void DisableScissor() { }
 
-		public void Begin() { }
-		public void End() { }
 		public void Clear(Color c) { }
 
 		public void Present(IInputHandler ih)