diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm
index 22edf961270..a8639a1a948 100644
--- a/code/modules/mob/living/carbon/human/species/diona.dm
+++ b/code/modules/mob/living/carbon/human/species/diona.dm
@@ -108,13 +108,4 @@
 
 /datum/species/diona/pod //Same name and everything; we want the same limitations on them; we just want their regeneration to kick in at all times and them to have special factions
 	pod = TRUE
-
-/datum/species/diona/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species)
-	. = ..()
-	C.faction |= "plants"
-	C.faction |= "vines"
-
-/datum/species/diona/pod/on_species_loss(mob/living/carbon/C)
-	. = ..()
-	C.faction -= "plants"
-	C.faction -= "vines"
+	inherent_factions = list("plants", "vines")
diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm
index 7d1d4c26a61..63f062b8bc8 100644
--- a/code/modules/mob/living/carbon/human/species/shadow.dm
+++ b/code/modules/mob/living/carbon/human/species/shadow.dm
@@ -5,6 +5,7 @@
 	icobase = 'icons/mob/human_races/r_shadow.dmi'
 	deform = 'icons/mob/human_races/r_shadow.dmi'
 	dangerous_existence = TRUE
+	inherent_factions = list("faithless")
 
 	unarmed_type = /datum/unarmed_attack/claws
 
@@ -49,14 +50,12 @@
 	if(grant_vision_toggle)
 		vision_toggle = new
 		vision_toggle.Grant(H)
-	H.faction |= "faithless"
 
 /datum/species/shadow/on_species_loss(mob/living/carbon/human/H)
 	..()
 	if(grant_vision_toggle && vision_toggle)
 		H.vision_type = null
 		vision_toggle.Remove(H)
-	H.faction -= "faithless"
 
 /datum/species/shadow/handle_life(mob/living/carbon/human/H)
 	var/light_amount = 0