diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index c94da5686a..14645aff0b 100755
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -146,7 +146,6 @@ namespace OpenRA.Editor
 			Rules.LoadRules(manifest, map);
 			tileset = Rules.TileSets[map.Tileset];
 			tilesetRenderer = new TileSetRenderer(tileset, new Size(manifest.TileSize, manifest.TileSize));
-			tileset.LoadTiles();
 			var shadowIndex = new int[] { 3, 4 };
 			var palette = new Palette(FileSystem.Open(tileset.Palette), shadowIndex);
 
diff --git a/OpenRA.FileFormats/Map/TileSet.cs b/OpenRA.FileFormats/Map/TileSet.cs
index 7fe1145459..788f696094 100644
--- a/OpenRA.FileFormats/Map/TileSet.cs
+++ b/OpenRA.FileFormats/Map/TileSet.cs
@@ -71,8 +71,6 @@ namespace OpenRA.FileFormats
 
 			return new MiniYaml(null, root);
 		}
-
-		public Terrain Data;
 	}
 
 	public class TileSet
@@ -108,14 +106,6 @@ namespace OpenRA.FileFormats
 				.Select(y => new TileTemplate(y)).ToDictionary(t => t.Id);
 		}
 
-		public void LoadTiles()
-		{
-			foreach (var t in Templates)
-				if (t.Value.Data == null)
-					using (var s = FileSystem.OpenWithExts(t.Value.Image, Extensions))
-						t.Value.Data = new Terrain(s);
-		}
-
 		public void Save(string filepath)
 		{
 			var root = new List<MiniYamlNode>();
@@ -153,43 +143,5 @@ namespace OpenRA.FileFormats
 
 			return ret;
 		}
-
-		public Bitmap RenderTemplate(ushort n, Palette p)
-		{
-			var template = Templates[n];
-
-			var bitmap = new Bitmap(TileSize * template.Size.X, TileSize * template.Size.Y,
-				PixelFormat.Format8bppIndexed);
-
-			bitmap.Palette = p.AsSystemPalette();
-
-			var data = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
-			unsafe
-			{
-				byte* q = (byte*)data.Scan0.ToPointer();
-				var stride = data.Stride;
-
-				for (var u = 0; u < template.Size.X; u++)
-					for (var v = 0; v < template.Size.Y; v++)
-						if (template.Data.TileBitmapBytes[u + v * template.Size.X] != null)
-						{
-							var rawImage = template.Data.TileBitmapBytes[u + v * template.Size.X];
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = rawImage[i + TileSize * j];
-						}
-						else
-						{
-							for (var i = 0; i < TileSize; i++)
-								for (var j = 0; j < TileSize; j++)
-									q[(v * TileSize + j) * stride + u * TileSize + i] = 0;
-						}
-			}
-
-			bitmap.UnlockBits(data);
-			return bitmap;
-		}
 	}
 }
diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs
index fe07516552..1ba2aa50e0 100644
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -119,8 +119,6 @@ namespace OpenRA
 			Map = map;
 
 			TileSet = Rules.TileSets[Map.Tileset];
-			TileSet.LoadTiles();
-
 			SharedRandom = new XRandom(orderManager.LobbyInfo.GlobalSettings.RandomSeed);
 
 			WorldActor = CreateActor( "World", new TypeDictionary() );
diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs
index 84834e3594..9669609ebd 100644
--- a/OpenRA.Utility/Command.cs
+++ b/OpenRA.Utility/Command.cs
@@ -342,7 +342,6 @@ namespace OpenRA.Utility
 				throw new InvalidOperationException("No theater named '{0}'".F(theater));
 
 			var renderer = new TileSetRenderer(tileset, new Size(manifest.TileSize, manifest.TileSize));
-			tileset.LoadTiles();
 			var palette = new Palette(FileSystem.Open(tileset.Palette), shadowIndex);
 
 			foreach (var templateName in templateNames)