diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 200c6903f1..97a41098f2 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -28,12 +28,6 @@ Class Variables:
    component_parts (list)
       A list of component parts of machine used by frame based machines.
 
-   uid (num)
-      Unique id of machine across all machines.
-
-   gl_uid (global num)
-      Next uid value in sequence
-
    stat (bitflag)
       Machine status bit flags.
       Possible bit flags:
@@ -77,9 +71,6 @@ Class Procs:
 
       Default definition does nothing.
 
-   assign_uid()               'game/machinery/machine.dm'
-      Called by machine to assign a value to the uid variable.
-
    process()                  'game/machinery/machine.dm'
       Called by the 'machinery subsystem' once per machinery tick for each machine that is listed in its 'machines' list.
 
@@ -506,7 +497,7 @@ Class Procs:
 		#if DM_VERSION >= 513
 		#warning 512 is definitely stable now, remove the old code
 		#endif
-		
+
 		#if DM_VERSION >= 512
 		. += hex2num(md5[i])
 		#else
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
deleted file mode 100644
index a1a67e2542..0000000000
--- a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
+++ /dev/null
@@ -1,16 +0,0 @@
-/obj/machinery/atmospherics/components/unary/generator_input
-
-	icon_state = "he_intact"
-	density = TRUE
-
-	name = "generator input"
-	desc = "An input for a generator."
-	layer = LOW_OBJ_LAYER
-
-	var/update_cycle
-
-/obj/machinery/atmospherics/components/unary/generator_input/update_icon()
-	icon_state = NODE1 ? "intact" : "exposed"
-
-/obj/machinery/atmospherics/components/unary/generator_input/proc/return_exchange_air()
-	return AIR1
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
deleted file mode 100644
index 0070cce9a1..0000000000
--- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
+++ /dev/null
@@ -1,57 +0,0 @@
-/obj/machinery/atmospherics/components/unary/oxygen_generator
-
-	icon_state = "o2gen_map"
-
-	name = "oxygen generator"
-	desc = "Generates oxygen."
-
-	dir = SOUTH
-	initialize_directions = SOUTH
-	layer = GAS_SCRUBBER_LAYER
-
-	var/on = FALSE
-
-	var/oxygen_content = 10
-
-/obj/machinery/atmospherics/components/unary/oxygen_generator/update_icon_nopipes()
-
-	cut_overlays()
-	if(showpipe)
-		add_overlay(getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions)) //it works for now
-
-	if(!NODE1 || !on || !is_operational())
-		icon_state = "o2gen_off"
-		return
-
-	else
-		icon_state = "o2gen_on"
-
-/obj/machinery/atmospherics/components/unary/oxygen_generator/New()
-	..()
-	var/datum/gas_mixture/air_contents = AIR1
-	air_contents.volume = 50
-	AIR1 = air_contents
-
-/obj/machinery/atmospherics/components/unary/oxygen_generator/process_atmos()
-
-	..()
-
-	if(!on)
-		return 0
-
-	var/datum/gas_mixture/air_contents = AIR1
-
-	var/total_moles = air_contents.total_moles()
-
-	if(total_moles < oxygen_content)
-		var/current_heat_capacity = air_contents.heat_capacity()
-
-		var/added_oxygen = oxygen_content - total_moles
-
-		air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
-		ASSERT_GAS(/datum/gas/oxygen, air_contents)
-		air_contents.gases[/datum/gas/oxygen][MOLES] += added_oxygen
-
-		update_parents()
-
-	return 1
diff --git a/icons/obj/atmospherics/components/unary_devices.dmi b/icons/obj/atmospherics/components/unary_devices.dmi
index 33fa7f5895..98e043c07f 100644
Binary files a/icons/obj/atmospherics/components/unary_devices.dmi and b/icons/obj/atmospherics/components/unary_devices.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 3e24d7fc0e..11558ce48c 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1203,10 +1203,8 @@
 #include "code\modules\atmospherics\machinery\components\trinary_devices\mixer.dm"
 #include "code\modules\atmospherics\machinery\components\trinary_devices\trinary_devices.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\cryo.dm"
-#include "code\modules\atmospherics\machinery\components\unary_devices\generator_input.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\heat_exchanger.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
-#include "code\modules\atmospherics\machinery\components\unary_devices\oxygen_generator.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\portables_connector.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\tank.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\thermomachine.dm"