diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index 093ee358c8f4e03668f589b016cfd2a9e0c8f14b..887c184cd398bd5a536a994d09a8b40aa2c38b84 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -121,10 +121,7 @@ App.UI.View.MainLinks = function() {
 		});
 		/* cycle through slaves, for each slave cycle through completed organs and track how many are of the interrogated slave (and if organs have a slaves to be implanted on) */
 		for (let i = 0; i < V.slaves.length; i++) {
-			let slaveOrgans = 0;
-			V.completedOrgans.forEach(organ => {
-				if (organ.ID === V.slaves[i].ID) { slaveOrgans++; }
-			});
+			const slaveOrgans = V.completedOrgans.reduce((acc, organ) => organ.ID === V.slaves[i].ID ? acc + 1 : acc, 0);
 			/* if the interrogated slave has one or more organs ready: */
 			if (slaveOrgans > 0) {
 				r += '<br><span class="yellow">The fabricator has completed ';
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 5cd79c26d18076e26576f88b04ac7484ecd637ec..317a0d21efd80461b34c19fdd1644866484d8892 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -303,21 +303,18 @@ window.assignJob = function assignJob(slave, job) {
 	}
 
 	if (slave.assignmentVisible === 0 && Array.isArray(V.personalAttention)) {
-		const awi = V.personalAttention.findIndex(s => s.ID === slave.ID);
-		if (awi !== -1) {
-			V.personalAttention.deleteAt(awi);
-			if (V.personalAttention.length === 0) {
-				if (V.PC.career === "escort") {
-					V.personalAttention = "whoring";
-				} else if (V.PC.career === "servant") {
-					V.personalAttention = "upkeep";
-				} else {
-					V.personalAttention = "business";
-				}
-				r += `${slave.slaveName} no longer has your personal attention; you plan to focus on ${V.personalAttention}.`;
+		V.personalAttention.deleteWith(s => s.ID === slave.ID);
+		if (V.personalAttention.length === 0) {
+			if (V.PC.career === "escort") {
+				V.personalAttention = "whoring";
+			} else if (V.PC.career === "servant") {
+				V.personalAttention = "upkeep";
 			} else {
-				r += `${slave.slaveName} no longer has your personal attention.`;
+				V.personalAttention = "business";
 			}
+			r += `${slave.slaveName} no longer has your personal attention; you plan to focus on ${V.personalAttention}.`;
+		} else {
+			r += `${slave.slaveName} no longer has your personal attention.`;
 		}
 	}
 	V.JobIDArray = resetJobIDArray();
@@ -490,11 +487,7 @@ window.removeJob = function removeJob(slave, assignment) {
 			case "be your agent":
 			case "live with your agent":
 				slave.assignment = "rest";
-				const _leaderIndex = V.leaders.findIndex(function(x) {
-					return x.ID === slave.ID;
-				});
-				if (_leaderIndex !== -1) { V.leaders.deleteAt(_leaderIndex); }
-
+				V.leaders.deleteWith(s => s.ID === slave.ID);
 				if (slave.relationshipTarget > 0) {
 					/* following code assumes there can be at most one companion */
 					const _lover = V.slaves.findIndex(s => haveRelationshipP(s, slave) && s.assignment === "live with your agent");
diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js
index 95de27fc427b4a15888fb8aa7b9c190562a60702..9ba79e752902f63ce13633555112e7204ae420f2 100644
--- a/src/js/removeActiveSlave.js
+++ b/src/js/removeActiveSlave.js
@@ -125,17 +125,14 @@ window.removeActiveSlave = function removeActiveSlave() {
 		}
 
 		if (Array.isArray(V.personalAttention)) {
-			const _rasi = V.personalAttention.findIndex(s => s.ID === AS_ID);
-			if (_rasi !== -1) {
-				V.personalAttention.deleteAt(_rasi);
-				if (V.personalAttention.length === 0) {
-					if (V.PC.career === "escort") {
-						V.personalAttention = "whoring";
-					} else if (V.PC.career === "servant") {
-						V.personalAttention = "upkeep";
-					} else {
-						V.personalAttention = "business";
-					}
+			V.personalAttention.deleteWith(s => s.ID === AS_ID);
+			if (V.personalAttention.length === 0) {
+				if (V.PC.career === "escort") {
+					V.personalAttention = "whoring";
+				} else if (V.PC.career === "servant") {
+					V.personalAttention = "upkeep";
+				} else {
+					V.personalAttention = "business";
 				}
 			}
 		}
@@ -174,20 +171,10 @@ window.removeActiveSlave = function removeActiveSlave() {
 			}
 		}
 
-		let _o;
-		for (_o = 0; _o < V.organs.length; _o++) {
-			if (V.organs[_o].ID === AS_ID) {
-				V.organs.deleteAt(_o);
-				_o--;
-			}
-		}
-		for (_o = 0; _o < V.completedOrgans.length; _o++) {
-			if (V.completedOrgans[_o].ID === AS_ID) {
-				V.completedOrgans.deleteAt(_o);
-				_o--;
-			}
-		}
-		for (_o = 0; _o < V.adjustProsthetics.length; _o++) {
+		V.organs.deleteWith(s => s.ID === AS_ID);
+		V.completedOrgans.deleteWith(s => s.ID === AS_ID);
+
+		for (let _o = 0; _o < V.adjustProsthetics.length; _o++) {
 			if (V.adjustProsthetics[_o].ID === AS_ID) {
 				V.adjustProsthetics.deleteAt(_o);
 				V.adjustProstheticsCompleted--;