diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index 2bcccdb164..12c9bfb30e 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -1,129 +1,25 @@
-/**********************Prisoners' Console**************************/
-
-/obj/machinery/mineral/labor_claim_console
-	name = "point claim console"
-	desc = "A stacking console with an electromagnetic writer, used to track ore mined by prisoners."
-	icon = 'icons/obj/machines/mining_machines.dmi'
-	icon_state = "console"
+/**********************Prisoners' Console**************************/
+
+/obj/machinery/mineral/labor_claim_console
+	name = "point claim console"
+	desc = "A stacking console with an electromagnetic writer, used to track ore mined by prisoners."
+	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon_state = "console"
 	density = FALSE
 	anchored = TRUE
-	var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
-	var/machinedir = SOUTH
-	var/obj/item/card/id/prisoner/inserted_id
-	var/obj/machinery/door/airlock/release_door
-	var/door_tag = "prisonshuttle"
-	var/obj/item/device/radio/Radio //needed to send messages to sec radio
-
-
+	var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
+	var/machinedir = SOUTH
+	var/obj/item/card/id/prisoner/inserted_id
+	var/obj/machinery/door/airlock/release_door
+	var/door_tag = "prisonshuttle"
+	var/obj/item/device/radio/Radio //needed to send messages to sec radio
+
+
 /obj/machinery/mineral/labor_claim_console/Initialize()
 	. = ..()
-	Radio = new/obj/item/device/radio(src)
+	Radio = new/obj/item/device/radio(src)
 	Radio.listening = FALSE
 	locate_stacking_machine()
-<<<<<<< HEAD
-
-/obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/card/id/prisoner))
-		if(!inserted_id)
-			if(!user.drop_item())
-				return
-			I.forceMove(src)
-			inserted_id = I
-			to_chat(user, "<span class='notice'>You insert [I].</span>")
-			return
-		else
-			to_chat(user, "<span class='notice'>There's an ID inserted already.</span>")
-	return ..()
-
-/obj/machinery/mineral/labor_claim_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "labor_claim_console", name, 450, 475, master_ui, state)
-		ui.open()
-
-/obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
-	var/list/data = list()
-	var/can_go_home = FALSE
-
-	data["emagged"] = emagged
-	if(inserted_id)
-		data["id"] = inserted_id
-		data["id_name"] = inserted_id.registered_name
-		data["points"] = inserted_id.points
-		data["goal"] = inserted_id.goal
-	if(check_auth())
-		can_go_home = TRUE
-
-	var/list/ores = list()
-	if(stacking_machine)
-		data["unclaimed_points"] = stacking_machine.points
-		for(var/ore in stacking_machine.ore_values)
-			var/list/O = list()
-			O["ore"] = ore
-			O["value"] = stacking_machine.ore_values[ore]
-			ores += list(O)
-
-	data["ores"] = ores
-	data["can_go_home"] = can_go_home
-
-	return data
-
-/obj/machinery/mineral/labor_claim_console/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("handle_id")
-			if(inserted_id)
-				if(!usr.get_active_held_item())
-					usr.put_in_hands(inserted_id)
-					inserted_id = null
-				else
-					inserted_id.forceMove(get_turf(src))
-					inserted_id = null
-			else
-				var/obj/item/I = usr.get_active_held_item()
-				if(istype(I, /obj/item/card/id/prisoner))
-					if(!usr.drop_item())
-						return
-					I.forceMove(src)
-					inserted_id = I
-		if("claim_points")
-			inserted_id.points += stacking_machine.points
-			stacking_machine.points = 0
-			to_chat(usr, "Points transferred.")
-		if("move_shuttle")
-			if(!alone_in_area(get_area(src), usr))
-				to_chat(usr, "<span class='warning'>Prisoners are only allowed to be released while alone.</span>")
-			else
-				switch(SSshuttle.moveShuttle("laborcamp","laborcamp_home"))
-					if(1)
-						to_chat(usr, "<span class='notice'>Shuttle not found</span>")
-					if(2)
-						to_chat(usr, "<span class='notice'>Shuttle already at station</span>")
-					if(3)
-						to_chat(usr, "<span class='notice'>No permission to dock could be granted.</span>")
-					else
-						if(!emagged)
-							Radio.set_frequency(GLOB.SEC_FREQ)
-							Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", GLOB.SEC_FREQ, get_spans(), get_default_language())
-						to_chat(usr, "<span class='notice'>Shuttle received message and will be sent shortly.</span>")
-
-/obj/machinery/mineral/labor_claim_console/proc/check_auth()
-	if(emagged)
-		return 1 //Shuttle is emagged, let any ol' person through
-	return (istype(inserted_id) && inserted_id.points >= inserted_id.goal) //Otherwise, only let them out if the prisoner's reached his quota.
-
-/obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine()
-	stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
-	if(stacking_machine)
-		stacking_machine.CONSOLE = src
-	else
-		qdel(src)
-
-/obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
-	if(!emagged)
-=======
 
 /obj/machinery/mineral/labor_claim_console/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/card/id/prisoner))
@@ -224,48 +120,47 @@
 
 /obj/machinery/mineral/labor_claim_console/emag_act(mob/user)
 	if(!emagged)
->>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 		emagged = TRUE
-		to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
-
-
-/**********************Prisoner Collection Unit**************************/
-
-
-/obj/machinery/mineral/stacking_machine/laborstacker
-	var/points = 0 //The unclaimed value of ore stacked.  Value for each ore loosely relative to its rarity.
+		to_chat(user, "<span class='warning'>PZZTTPFFFT</span>")
+
+
+/**********************Prisoner Collection Unit**************************/
+
+
+/obj/machinery/mineral/stacking_machine/laborstacker
+	var/points = 0 //The unclaimed value of ore stacked.  Value for each ore loosely relative to its rarity.
 	var/list/ore_values = list("glass" = 1, "metal" = 2, "reinforced glass" = 4, "gold" = 20, "silver" = 20, "uranium" = 20, "titanium" = 20, "solid plasma" = 20, "plasteel" = 23, "plasma glass" = 23, "diamond" = 25, "bluespace polycrystal" = 30, "plastitanium" = 45, "bananium" = 50)
-
-/obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
-	if(istype(inp))
-		var/n = inp.name
-		var/a = inp.amount
-		if(n in ore_values)
-			points += ore_values[n] * a
-	..()
-
-
-/**********************Point Lookup Console**************************/
-/obj/machinery/mineral/labor_points_checker
-	name = "points checking console"
-	desc = "A console used by prisoners to check the progress on their quotas. Simply swipe a prisoner ID."
-	icon = 'icons/obj/machines/mining_machines.dmi'
-	icon_state = "console"
+
+/obj/machinery/mineral/stacking_machine/laborstacker/process_sheet(obj/item/stack/sheet/inp)
+	if(istype(inp))
+		var/n = inp.name
+		var/a = inp.amount
+		if(n in ore_values)
+			points += ore_values[n] * a
+	..()
+
+
+/**********************Point Lookup Console**************************/
+/obj/machinery/mineral/labor_points_checker
+	name = "points checking console"
+	desc = "A console used by prisoners to check the progress on their quotas. Simply swipe a prisoner ID."
+	icon = 'icons/obj/machines/mining_machines.dmi'
+	icon_state = "console"
 	density = FALSE
 	anchored = TRUE
-
-/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
-	user.examinate(src)
-
-/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/card/id))
-		if(istype(I, /obj/item/card/id/prisoner))
-			var/obj/item/card/id/prisoner/prisoner_id = I
-			to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
-			to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
-			to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")
-			to_chat(user, "<span class='notice'>Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.</span>")
-		else
-			to_chat(user, "<span class='warning'>Error: Invalid ID</span>")
-	else
-		return ..()
+
+/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
+	user.examinate(src)
+
+/obj/machinery/mineral/labor_points_checker/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/card/id))
+		if(istype(I, /obj/item/card/id/prisoner))
+			var/obj/item/card/id/prisoner/prisoner_id = I
+			to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
+			to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
+			to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")
+			to_chat(user, "<span class='notice'>Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.</span>")
+		else
+			to_chat(user, "<span class='warning'>Error: Invalid ID</span>")
+	else
+		return ..()