diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 2a8407ad7a..e376795704 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -1,51 +1,13 @@
-/obj/effect/spawner/newbomb
-	name = "bomb"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x"
-	var/btemp1 = 1500
-	var/btemp2 = 1000	// tank temperatures
-	var/assembly_type
-
-/obj/effect/spawner/newbomb/Initialize()
+/obj/effect/spawner/newbomb
+	name = "bomb"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x"
+	var/btemp1 = 1500
+	var/btemp2 = 1000	// tank temperatures
+	var/assembly_type
+
+/obj/effect/spawner/newbomb/Initialize()
 	. = ..()
-<<<<<<< HEAD
-	var/obj/item/device/transfer_valve/V = new(src.loc)
-	var/obj/item/tank/internals/plasma/full/PT = new(V)
-	var/obj/item/tank/internals/oxygen/OT = new(V)
-
-	PT.air_contents.temperature = btemp1 + T0C
-	OT.air_contents.temperature = btemp2 + T0C
-
-	V.tank_one = PT
-	V.tank_two = OT
-	PT.master = V
-	OT.master = V
-	
-	if(assembly_type)
-		var/obj/item/device/assembly/A = new assembly_type(V)
-		V.attached_device = A
-		A.holder = V
-		A.toggle_secure()
-
-	V.update_icon()
-	
-	qdel(src)
-
-/obj/effect/spawner/newbomb/timer
-	assembly_type = /obj/item/device/assembly/timer
-
-/obj/effect/spawner/newbomb/timer/syndicate
-	btemp1 = 150
-	btemp2 = 20
-
-/obj/effect/spawner/newbomb/proximity
-	assembly_type = /obj/item/device/assembly/prox_sensor
-
-/obj/effect/spawner/newbomb/radio
-	assembly_type = /obj/item/device/assembly/signaler
-	
-
-=======
 	var/obj/item/device/transfer_valve/V = new(src.loc)
 	var/obj/item/tank/internals/plasma/full/PT = new(V)
 	var/obj/item/tank/internals/oxygen/OT = new(V)
@@ -82,4 +44,3 @@
 	assembly_type = /obj/item/device/assembly/signaler
 	
 
->>>>>>> 395c0ee... Cleans up some qdel(src)'s in Initialize()