diff --git a/NewHorizons/Builder/Body/StarBuilder.cs b/NewHorizons/Builder/Body/StarBuilder.cs
index 99a6ee9f..7e32c3d3 100644
--- a/NewHorizons/Builder/Body/StarBuilder.cs
+++ b/NewHorizons/Builder/Body/StarBuilder.cs
@@ -126,6 +126,7 @@ namespace NewHorizons.Builder.Body
             light.CopyPropertiesFrom(SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent<Light>());
             light.intensity *= starModule.solarLuminosity;
             light.range = starModule.lightRadius;
+            light.range *= Mathf.Sqrt(starModule.solarLuminosity);
 
             Color lightColour = light.color;
             if (starModule.lightTint != null) lightColour = starModule.lightTint.ToColor();
diff --git a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
index ced3222a..ce904cca 100644
--- a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
+++ b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs
@@ -287,8 +287,6 @@ namespace NewHorizons.Components.SizeControllers
                 _stellarRemnant.SetActive(true);
                 var remnantStarController = _stellarRemnant.GetComponentInChildren<StarController>();
                 if (remnantStarController != null) StarLightController.AddStar(remnantStarController);
-                var remnantStarLight = _stellarRemnant.FindChild("SunLight");
-                if (remnantStarLight != null) StarLightController.AddStarLight(remnantStarLight.GetComponent<Light>());
             }
 
             if (Time.time > _supernovaStartTime + supernovaTime)
@@ -302,7 +300,6 @@ namespace NewHorizons.Components.SizeControllers
         private void DisableStar(bool start = false)
         {
             if (controller != null) StarLightController.RemoveStar(controller);
-            if (!isProxy) StarLightController.RemoveStarLight(gameObject.FindChild("SunLight").GetAddComponent<Light>());
 
             if (_stellarRemnant != null)
             {
diff --git a/NewHorizons/Components/StarLightController.cs b/NewHorizons/Components/StarLightController.cs
index a9e2b000..55a79074 100644
--- a/NewHorizons/Components/StarLightController.cs
+++ b/NewHorizons/Components/StarLightController.cs
@@ -14,7 +14,6 @@ namespace NewHorizons.Components
         public static StarLightController Instance { get; private set; }
 
         private List<StarController> _stars = new List<StarController>();
-        private List<Light> _lights = new List<Light>();
         private StarController _activeStar;
 
         private SunLightController _sunLightController;
@@ -54,20 +53,6 @@ namespace NewHorizons.Components
             }
         }
 
-        public static void AddStarLight(Light light)
-        {
-            if (light == null) return;
-
-            Instance._lights.Add(light);
-        }
-
-        public static void RemoveStarLight(Light light)
-        {
-            if (light == null) return;
-
-            if (Instance._lights.Contains(light)) Instance._lights.Remove(light);
-        }
-
         public void Update()
         {
             if (_activeStar == null || !_activeStar.gameObject.activeInHierarchy)
@@ -93,14 +78,13 @@ namespace NewHorizons.Components
                 material.SetFloat(SunIntensity, intensity);
             }
 
-            // Player is always at 0,0,0 more or less so if they arent using the map camera then wtv
-            var origin = Vector3.zero;
-
             foreach (var star in _stars)
             {
                 if (star == null) continue;
                 if (!(star.gameObject.activeSelf && star.gameObject.activeInHierarchy)) continue;
 
+                // Player is always at 0,0,0 more or less so if they arent using the map camera then wtv
+                var origin = Vector3.zero;
                 if (PlayerState.InMapView())
                 {
                     origin = Locator.GetActiveCamera().transform.position;
@@ -112,19 +96,6 @@ namespace NewHorizons.Components
                     break;
                 }
             }
-
-            if (PlayerState.InMapView())
-            {
-                foreach (var light in _lights) light.enabled = true;
-                return;
-            }
-
-            foreach (var light in _lights)
-            {
-                // Minimum 50km range so it's not badly noticeable for dim stars
-                if ((light.transform.position - origin).sqrMagnitude <= Mathf.Max(light.range * light.range, 2500000000)) light.enabled = true;
-                else light.enabled = false;
-            }
         }
 
         private void ChangeActiveStar(StarController star)
diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index 3c7c2d1d..4e4bab9b 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -59,7 +59,6 @@ namespace NewHorizons.Handlers
 
             starLightGO.AddComponent<StarLightController>();
             StarLightController.AddStar(starController);
-            StarLightController.AddStarLight(starController.Light);
 
             starLightGO.SetActive(true);
 
@@ -501,9 +500,6 @@ namespace NewHorizons.Handlers
 
                 if (starController != null) StarLightController.AddStar(starController);
 
-                var starLight = star.FindChild("SunLight");
-                if (starLight != null) StarLightController.AddStarLight(starLight.GetComponent<Light>());
-
                 // If it has an evolution controller that means it will die -> we make a remnant (unless its a remnant)
                 if (starEvolutionController != null && !body.Config.isStellarRemnant)
                 {
diff --git a/NewHorizons/Handlers/PlanetDestructionHandler.cs b/NewHorizons/Handlers/PlanetDestructionHandler.cs
index 7f8fbf28..4d60a271 100644
--- a/NewHorizons/Handlers/PlanetDestructionHandler.cs
+++ b/NewHorizons/Handlers/PlanetDestructionHandler.cs
@@ -118,7 +118,6 @@ namespace NewHorizons.Handlers
                     case AstroObject.Name.Sun:
                         var starController = ao.gameObject.GetComponent<StarController>();
                         StarLightController.RemoveStar(starController);
-                        StarLightController.RemoveStarLight(ao.gameObject.FindChild("Sector_SUN/Effects_SUN/SunLight").GetComponent<Light>());
                         GameObject.Destroy(starController);
 
                         var audio = ao.GetComponentInChildren<SunSurfaceAudioController>();