diff --git a/NewHorizons/Builder/General/PlanetDestroyer.cs b/NewHorizons/Builder/General/PlanetDestroyer.cs
index f1518c4e..9fb99db6 100644
--- a/NewHorizons/Builder/General/PlanetDestroyer.cs
+++ b/NewHorizons/Builder/General/PlanetDestroyer.cs
@@ -207,8 +207,6 @@ namespace NewHorizons.Builder.General
                     GameObject.Destroy(proxy.gameObject);
                 }
             }
-
-            HeavenlyBodyBuilder.Remove(ao);
         }
 
         public static void RemoveAllProxies()
diff --git a/NewHorizons/Components/Orbital/OrbitalParameters.cs b/NewHorizons/Components/Orbital/OrbitalParameters.cs
index 8dad4560..f5ff14fe 100644
--- a/NewHorizons/Components/Orbital/OrbitalParameters.cs
+++ b/NewHorizons/Components/Orbital/OrbitalParameters.cs
@@ -32,5 +32,10 @@ namespace NewHorizons.Components.Orbital
         {
             return Vector3.zero;
         }
+
+        public Vector3 GetPosition()
+        {
+            return Vector3.zero;
+        }
     }
 }
diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index 7fe0378a..f7507ab9 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -7,7 +7,6 @@ using NewHorizons.Builder.Updater;
 using NewHorizons.Components;
 using NewHorizons.External.VariableSize;
 using NewHorizons.Utility;
-using NewHorizons.Utility.CommonResources;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -278,8 +277,6 @@ namespace NewHorizons.Handlers
 
             if (ao.GetAstroObjectName() == AstroObject.Name.CustomString) AstroObjectLocator.RegisterCustomAstroObject(ao);
 
-            HeavenlyBodyBuilder.Make(go, body.Config, sphereOfInfluence, gv, initialMotion);
-
             return go;
         }
 
@@ -361,7 +358,7 @@ namespace NewHorizons.Handlers
         private static void UpdatePosition(GameObject go, NewHorizonsBody body, AstroObject primaryBody)
         {
             go.transform.parent = Locator.GetRootTransform();
-            go.transform.position = CommonResourcesUtilities.GetPosition(body.Config.Orbit) + (primaryBody == null ? Vector3.zero : primaryBody.transform.position);
+            go.transform.position = body.Config.Orbit.GetOrbitalParameters().GetPosition() + (primaryBody == null ? Vector3.zero : primaryBody.transform.position);
 
             if (go.transform.position.magnitude > Main.FurthestOrbit)
             {