all else

code/modules/modular_computers/computers/item/computer.dm

@@ -71,7 +71,6 @@
 	for(var/H in all_components)
 		var/obj/item/computer_hardware/CH = all_components[H]
 		if(CH.holder == src)
-			CH.on_remove(src)
 			CH.holder = null
 			all_components.Remove(CH.device_type)
 			qdel(CH)

code/modules/modular_computers/file_system/programs/signaler.dm

@@ -19,6 +19,11 @@
 	set_frequency(signal_frequency)
 	return ..()
 
+/datum/computer_file/program/signaler/Destroy()
+	SSradio.remove_object(src, signal_frequency)
+	radio_connection = null
+	return ..()
+
 /datum/computer_file/program/signaler/ui_data(mob/user)
 	var/list/data = get_header_data()
 	data["frequency"] = signal_frequency

code/modules/modular_computers/hardware/ai_slot.dm

@@ -10,6 +10,10 @@
 	var/obj/item/aicard/stored_card
 	var/locked = FALSE
 
+/obj/item/computer_hardware/ai_slot/Destroy()
+	QDEL_NULL(stored_card)
+	return ..()
+
 ///What happens when the intellicard is removed (or deleted) from the module, through try_eject() or not.
 /obj/item/computer_hardware/ai_slot/Exited(atom/movable/gone, direction)
 	if(stored_card == gone)
@@ -55,7 +59,7 @@
 		if(Adjacent(user))
 			user.put_in_hands(stored_card)
 		else
-			stored_card.forceMove(drop_location())
+			stored_card.forceMove(get_turf(src))
 
 		return TRUE
 	return FALSE

code/modules/modular_computers/hardware/battery_module.dm

@@ -16,7 +16,7 @@
 		battery = new battery_type(src)
 
 /obj/item/computer_hardware/battery/Destroy()
-	battery = null
+	QDEL_NULL(battery)
 	return ..()
 
 ///What happens when the battery is removed (or deleted) from the module, through try_eject() or not.
@@ -59,7 +59,7 @@
 			user.put_in_hands(battery)
 			to_chat(user, span_notice("You detach \the [battery] from \the [src]."))
 		else
-			battery.forceMove(drop_location())
+			battery.forceMove(get_turf(src))
 		return TRUE
 
 /obj/item/stock_parts/cell/computer

code/modules/modular_computers/hardware/card_slot.dm

@@ -94,7 +94,7 @@
 	if(user && !issilicon(user) && in_range(src, user))
 		user.put_in_hands(stored_card)
 	else
-		stored_card.forceMove(drop_location())
+		stored_card.forceMove(get_turf(src))
 
 	to_chat(user, span_notice("You remove the card from \the [src]."))
 	playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)