diff --git a/code/modules/supermatter/setup_supermatter.dm b/code/modules/power/supermatter/setup_supermatter.dm
similarity index 100%
rename from code/modules/supermatter/setup_supermatter.dm
rename to code/modules/power/supermatter/setup_supermatter.dm
diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
similarity index 94%
rename from code/modules/supermatter/supermatter.dm
rename to code/modules/power/supermatter/supermatter.dm
index b80d21b64d..51993daed4 100644
--- a/code/modules/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -264,15 +264,7 @@
 		if(eye_shield < 1)
 			l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) )
 
-/*
-	//adjusted range so that a power of 170 (pretty high) results in 9 tiles, roughly the distance from the core to the engine monitoring room.
-	//note that the rads given at the maximum range is a constant 0.2 - as power increases the maximum range merely increases.
-	for(var/mob/living/l in range(src, round(sqrt(power / 2))))
-		var/radius = max(get_dist(l, src), 1)
-		var/rads = (power / 10) * ( 1 / (radius**2) )
-		l.apply_effect(rads, IRRADIATE)
-*/
-	radiation_repository.radiate(src, power * 1.5) //Better close those shutters!
+	radiation_repository.radiate(src, max(power * 1.5, 50) ) //Better close those shutters!
 
 	power -= (power/DECAY_FACTOR)**3		//energy losses due to radiation
 
@@ -335,16 +327,6 @@
 		ui.set_auto_update(1)
 
 
-/*
-/obj/machinery/power/supermatter/proc/transfer_energy()
-	for(var/obj/machinery/power/rad_collector/R in rad_collectors)
-		var/distance = get_dist(R, src)
-		if(distance <= 15)
-			//for collectors using standard phoron tanks at 1013 kPa, the actual power generated will be this power*POWER_FACTOR*20*29 = power*POWER_FACTOR*580
-			R.receive_pulse(power * POWER_FACTOR * (min(3/distance, 1))**2)
-	return
-*/
-
 /obj/machinery/power/supermatter/attackby(obj/item/weapon/W as obj, mob/living/user as mob)
 	user.visible_message("<span class=\"warning\">\The [user] touches \a [W] to \the [src] as a silence fills the room...</span>",\
 		"<span class=\"danger\">You touch \the [W] to \the [src] when everything suddenly goes silent.\"</span>\n<span class=\"notice\">\The [W] flashes into dust as you flinch away from \the [src].</span>",\
diff --git a/polaris.dme b/polaris.dme
index df0a5c9089..495438c25a 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1927,6 +1927,8 @@
 #include "code\modules\power\singularity\particle_accelerator\particle_control.dm"
 #include "code\modules\power\singularity\particle_accelerator\particle_emitter.dm"
 #include "code\modules\power\singularity\particle_accelerator\particle_power.dm"
+#include "code\modules\power\supermatter\setup_supermatter.dm"
+#include "code\modules\power\supermatter\supermatter.dm"
 #include "code\modules\projectiles\ammunition.dm"
 #include "code\modules\projectiles\dnalocking.dm"
 #include "code\modules\projectiles\effects.dm"
@@ -2128,8 +2130,6 @@
 #include "code\modules\spells\targeted\projectile\fireball.dm"
 #include "code\modules\spells\targeted\projectile\magic_missile.dm"
 #include "code\modules\spells\targeted\projectile\projectile.dm"
-#include "code\modules\supermatter\setup_supermatter.dm"
-#include "code\modules\supermatter\supermatter.dm"
 #include "code\modules\surgery\_defines.dm"
 #include "code\modules\surgery\bones.dm"
 #include "code\modules\surgery\encased.dm"