diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 91983ead15..7a051f999d 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -201,7 +201,7 @@
 	. = LAZYLEN(antag_datums)
 	LAZYADD(antag_datums, instanced_datum)
 	if(!.)
-		current.verbs += /mob/proc/edit_objectives_and_ambitions
+		add_verb(current, /mob/proc/edit_objectives_and_ambitions)
 //ambition end
 
 /datum/mind/proc/remove_antag_datum(datum_type)
@@ -218,7 +218,7 @@
 	LAZYREMOVE(antag_datums, instanced_datum)
 	if(. && !LAZYLEN(antag_datums))
 		ambitions = null
-		current.verbs -= /mob/proc/edit_objectives_and_ambitions
+		remove_verb(current, /mob/proc/edit_objectives_and_ambitions)
 //ambition end
 
 /datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us.
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 4fbca1b32a..61936b4b7f 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -82,9 +82,8 @@ GLOBAL_LIST_EMPTY(antagonists)
 	if(!owner)
 		stack_trace("Destroy()ing antagonist datum when it has no owner.")
 	else
-		LAZYREMOVE(owner.antag_datums, src)
 //ambition start
-	owner?.do_remove_antag_datum(src)
+		owner?.do_remove_antag_datum(src)
 //ambition end
 	owner = null
 	return ..()
@@ -237,7 +236,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 
 	remove_innate_effects()
 	clear_antag_moodies()
-	LAZYREMOVE(owner.antag_datums, src)
+	owner.do_remove_antag_datum(src)
 	// cit skill
 	for(var/A in skill_modifiers)
 		owner.remove_skill_modifier(GET_SKILL_MOD_ID(A, type))