diff --git a/OpenRa.Core/FileSystem.cs b/OpenRa.Core/FileSystem.cs
deleted file mode 100644
index f1ddf5f648..0000000000
--- a/OpenRa.Core/FileSystem.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-
-namespace OpenRa.Core
-{
-	public static class FileSystem
-	{
-		static List<IPackage> packages = new List<IPackage>();
-
-		public static void Mount(IPackage package)
-		{
-			packages.Add(package);
-		}
-
-		internal static Stream GetItem(string filename)
-		{
-			foreach (IPackage package in packages)
-			{
-				Stream s = package.GetItem(filename);
-				if (s != null)
-					return s;
-			}
-
-			return null;
-		}
-	}
-}
diff --git a/OpenRa.Core/IPackage.cs b/OpenRa.Core/IPackage.cs
deleted file mode 100644
index e303ea8d31..0000000000
--- a/OpenRa.Core/IPackage.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-
-namespace OpenRa.Core
-{
-	public interface IPackage
-	{
-		Stream GetItem(string filename);
-	}
-}
diff --git a/OpenRa.Core/OpenRa.Core.csproj b/OpenRa.Core/OpenRa.Core.csproj
deleted file mode 100644
index f8449b8ca8..0000000000
--- a/OpenRa.Core/OpenRa.Core.csproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1B60782F-B2DD-43F1-B51D-B798485F317C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa.Core</RootNamespace>
-    <AssemblyName>OpenRa.Core</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FileSystem.cs" />
-    <Compile Include="IPackage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Reflect.cs" />
-    <Compile Include="Resource.cs" />
-    <Compile Include="ResourceBindingAttribute.cs" />
-    <Compile Include="ResourceCache.cs" />
-    <Compile Include="ResourceLoader.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/OpenRa.Core/Properties/AssemblyInfo.cs b/OpenRa.Core/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2827833515..0000000000
--- a/OpenRa.Core/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("OpenRa.Core")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenRa.Core")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenRa.Core/Reflect.cs b/OpenRa.Core/Reflect.cs
deleted file mode 100644
index 09a5d4bb5e..0000000000
--- a/OpenRa.Core/Reflect.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenRa.Core
-{
-	static class Reflect
-	{
-		public static T GetAttribute<T>(Type t) 
-			where T : Attribute
-		{
-			T[] attribs = (T[])t.GetCustomAttributes(typeof(T), false);
-			if (attribs == null || attribs.Length == 0)
-				return null;
-			return attribs[0];
-		}
-	}
-}
diff --git a/OpenRa.Core/Resource.cs b/OpenRa.Core/Resource.cs
deleted file mode 100644
index 5dbd559f91..0000000000
--- a/OpenRa.Core/Resource.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenRa.Core
-{
-	public interface IResource { }
-
-	public abstract class Resource<T> : IResource
-		where T : Resource<T>
-	{
-		public static T Get(string filename)
-		{
-			return (T)ResourceCache.Get(filename);
-		}
-	}
-}
diff --git a/OpenRa.Core/ResourceBindingAttribute.cs b/OpenRa.Core/ResourceBindingAttribute.cs
deleted file mode 100644
index f6c950c015..0000000000
--- a/OpenRa.Core/ResourceBindingAttribute.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenRa.Core
-{
-	public class ResourceBindingAttribute : Attribute
-	{
-		internal readonly string[] Extensions;
-
-		public ResourceBindingAttribute(params string[] extensions)
-		{
-			Extensions = extensions;
-		}
-	}
-}
diff --git a/OpenRa.Core/ResourceCache.cs b/OpenRa.Core/ResourceCache.cs
deleted file mode 100644
index b1748344ba..0000000000
--- a/OpenRa.Core/ResourceCache.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-
-namespace OpenRa.Core
-{
-	static class ResourceCache
-	{
-		static Dictionary<string, IResource> items = new Dictionary<string, IResource>();
-
-		public static void Flush()
-		{
-			items.Clear();
-		}
-
-		public static IResource Get(string filename)
-		{
-			IResource r;
-			if (!items.TryGetValue(filename, out r))
-				items.Add(filename, r = Load(filename));
-			return r;
-		}
-
-		static IResource Load(string filename)
-		{
-			Converter<Stream, IResource> loader = 
-				ResourceLoader.GetLoader(Path.GetExtension(filename));
-
-			if (loader == null)
-				return null;
-
-			Stream s = FileSystem.GetItem(filename);
-
-			if (s == null)
-				return null;
-
-			return loader(s);
-		}
-	}
-}
diff --git a/OpenRa.Core/ResourceLoader.cs b/OpenRa.Core/ResourceLoader.cs
deleted file mode 100644
index c15b4bc447..0000000000
--- a/OpenRa.Core/ResourceLoader.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Reflection;
-
-namespace OpenRa.Core
-{
-	static class ResourceLoader
-	{
-		static Dictionary<string, Converter<Stream, IResource>> loaders = 
-			new Dictionary<string,Converter<Stream,IResource>>();
-
-		static ResourceLoader()
-		{
-			foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies())
-				BindTypes(a);
-
-			AppDomain.CurrentDomain.AssemblyLoad +=
-				delegate(object unused, AssemblyLoadEventArgs e) { BindTypes(e.LoadedAssembly); };
-		}
-
-		static void BindTypes(Assembly a)
-		{
-			foreach (Type t in a.GetTypes())
-				BindType(t);
-		}
-
-		static void BindType(Type t)
-		{
-			ResourceBindingAttribute a = Reflect.GetAttribute<ResourceBindingAttribute>(t);
-			if (a == null)
-				return;
-
-			ConstructorInfo ctor = t.GetConstructor(new Type[] { typeof(Stream) });
-			if (ctor == null)
-				return;
-
-			Converter<Stream, IResource> loader = delegate(Stream s)
-			{
-				return (IResource)ctor.Invoke(new object[] { s });
-			};
-
-			foreach (string extension in a.Extensions)
-				loaders.Add(extension, loader);
-		}
-
-		public static Converter<Stream, IResource> GetLoader(string extension)
-		{
-			Converter<Stream, IResource> result;
-			loaders.TryGetValue(extension.ToLowerInvariant(), out result);
-			return result;
-		}
-	}
-}
diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
index 200e98133b..a5d6eb0fa8 100644
--- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -54,12 +54,6 @@
     <Compile Include="TileSet.cs" />
     <Compile Include="Tuple.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenRa.Core\OpenRa.Core.csproj">
-      <Project>{1B60782F-B2DD-43F1-B51D-B798485F317C}</Project>
-      <Name>OpenRa.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OpenRa.FileFormats/Package.cs b/OpenRa.FileFormats/Package.cs
index a999961351..95070cd55c 100644
--- a/OpenRa.FileFormats/Package.cs
+++ b/OpenRa.FileFormats/Package.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using OpenRa.Core;
 
 namespace OpenRa.FileFormats
 {
diff --git a/OpenRa.Game/Mcv.cs b/OpenRa.Game/Mcv.cs
index 74c7e19145..e4728e78a4 100644
--- a/OpenRa.Game/Mcv.cs
+++ b/OpenRa.Game/Mcv.cs
@@ -132,6 +132,7 @@ namespace OpenRa.Game
 				{
 					world.AddFrameEndTask(delegate
 					{
+						world.Remove( this );
 						world.Add(new ConstructionYard((fromCell * 24 - new int2(24, 24)).ToFloat2(), palette));
 					});
 					currentOrder = null;
diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs
index 47f026465f..1488885026 100644
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -25,6 +25,7 @@ namespace OpenRa.Game
 		}
 
 		public void Add(Actor a) { actors.Add(a); }
+		public void Remove( Actor a ) { actors.Remove( a ); }
 		public void AddFrameEndTask( Action<World> a ) { frameEndActions.Add( a ); }
 
 		double lastTime = Environment.TickCount / 1000.0;
diff --git a/OpenRa.sln b/OpenRa.sln
index 54a110afd6..64db614ef1 100644
--- a/OpenRa.sln
+++ b/OpenRa.sln
@@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.FileFormats", "OpenR
 		{6F5D4280-3D23-41FF-AE2A-511B5553E377} = {6F5D4280-3D23-41FF-AE2A-511B5553E377}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Core", "OpenRa.Core\OpenRa.Core.csproj", "{1B60782F-B2DD-43F1-B51D-B798485F317C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Game", "OpenRa.Game\OpenRa.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4EA97564-C929-4ABE-AC5D-A9D11EDE08E1} = {4EA97564-C929-4ABE-AC5D-A9D11EDE08E1}
@@ -51,16 +49,6 @@ Global
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1B60782F-B2DD-43F1-B51D-B798485F317C}.Release|Win32.ActiveCfg = Release|Any CPU
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU