diff --git a/apps/backend/Universe/Scenario/WorldBuilder.cs b/apps/backend/Universe/Scenario/WorldBuilder.cs
index afe1a91..4091fdf 100644
--- a/apps/backend/Universe/Scenario/WorldBuilder.cs
+++ b/apps/backend/Universe/Scenario/WorldBuilder.cs
@@ -16,15 +16,10 @@ internal sealed class WorldBuilder(
           generationService.InjectSpecialSystems(catalog.AuthoredSystems),
           worldGeneration.TargetSystemCount);
 
-        Console.WriteLine("TEST");
-        Console.WriteLine(string.Join(',', systems.Select(s => s.Id)));
-
         var scenario = dataLoader.NormalizeScenarioToAvailableSystems(
           catalog.Scenario,
           systems.Select(system => system.Id).ToList());
 
-        Console.WriteLine(string.Join(',', systems.Select(s => s.Id)));
-
         var systemRuntimes = systems
           .Select(definition => new SystemRuntime
           {
@@ -72,35 +67,6 @@ internal sealed class WorldBuilder(
           ? seedingService.CreatePlayerFaction(factions, stations, ships, commanders, policies, nowUtc)
           : null;
         var claims = seedingService.CreateClaims(stations, spatialLayout.Celestials, nowUtc);
-        var bootstrapWorld = new SimulationWorld
-        {
-            Label = "Split Viewer / Bootstrap World",
-            Seed = WorldSeed,
-            Balance = catalog.Balance,
-            Systems = systemRuntimes,
-            Celestials = spatialLayout.Celestials,
-            Nodes = spatialLayout.Nodes,
-            Wrecks = [],
-            Stations = stations,
-            Ships = ships,
-            Factions = factions,
-            PlayerFaction = playerFaction,
-            Commanders = commanders,
-            Claims = claims,
-            ConstructionSites = [],
-            MarketOrders = [],
-            Policies = policies,
-            ShipDefinitions = new Dictionary<string, ShipDefinition>(catalog.ShipDefinitions, StringComparer.Ordinal),
-            ItemDefinitions = new Dictionary<string, ItemDefinition>(catalog.ItemDefinitions, StringComparer.Ordinal),
-            ModuleDefinitions = new Dictionary<string, ModuleDefinition>(catalog.ModuleDefinitions, StringComparer.Ordinal),
-            ModuleRecipes = new Dictionary<string, ModuleRecipeDefinition>(catalog.ModuleRecipes, StringComparer.Ordinal),
-            Recipes = new Dictionary<string, RecipeDefinition>(catalog.Recipes, StringComparer.Ordinal),
-            ProductionGraph = catalog.ProductionGraph,
-            OrbitalTimeSeconds = WorldSeed * 97d,
-            GeneratedAtUtc = nowUtc,
-        };
-        var (constructionSites, marketOrders) = seedingService.CreateConstructionSites(bootstrapWorld);
-
         var world = new SimulationWorld
         {
             Label = "Split Viewer / Simulation World",
@@ -117,8 +83,8 @@ internal sealed class WorldBuilder(
             Geopolitics = null,
             Commanders = commanders,
             Claims = claims,
-            ConstructionSites = constructionSites,
-            MarketOrders = marketOrders,
+            ConstructionSites = [],
+            MarketOrders = [],
             Policies = policies,
             ShipDefinitions = new Dictionary<string, ShipDefinition>(catalog.ShipDefinitions, StringComparer.Ordinal),
             ItemDefinitions = new Dictionary<string, ItemDefinition>(catalog.ItemDefinitions, StringComparer.Ordinal),
@@ -127,9 +93,13 @@ internal sealed class WorldBuilder(
             Recipes = new Dictionary<string, RecipeDefinition>(catalog.Recipes, StringComparer.Ordinal),
             ProductionGraph = catalog.ProductionGraph,
             OrbitalTimeSeconds = WorldSeed * 97d,
-            GeneratedAtUtc = DateTimeOffset.UtcNow,
+            GeneratedAtUtc = nowUtc,
         };
 
+        var (constructionSites, marketOrders) = seedingService.CreateConstructionSites(world);
+        world.ConstructionSites.AddRange(constructionSites);
+        world.MarketOrders.AddRange(marketOrders);
+
         var geopolitics = new GeopoliticalSimulationService();
         geopolitics.Update(world, 0f, []);
         return world;