diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index e7450539b16cc3d10349ddda25dff2f55737269a..f9d0938046afe64924d1d3f72a94bb472e5a4da4 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1345,7 +1345,7 @@ App.Update.globalVariables = function(node) {
 };
 
 App.Update.slaveVariables = function(node) {
-	/* Adding a new variable? Consider putting it in datatypeCleanupJS.tw instead of here */
+	/* Adding a new variable? Consider putting it in datatypeCleanup.js instead of here */
 	for (let bci = 0; bci < V.slaves.length; bci++) {
 		let Slave = V.slaves[bci];
 
@@ -1368,26 +1368,21 @@ App.Update.slaveRecords = function(node) {
 		App.Entity.Utils.SlaveDataSchemeCleanup(slave);
 		SlaveDatatypeCleanup(slave);
 	});
-	if (V.hostage !== 0) {
-		App.Update.Slave(V.hostage);
-		App.Entity.Utils.SlaveDataSchemeCleanup(V.hostage);
-		SlaveDatatypeCleanup(V.hostage);
-	}
-	if (typeof V.slaveAfterRA !== "undefined") {
-		App.Update.Slave(V.slaveAfterRA);
-		App.Entity.Utils.SlaveDataSchemeCleanup(V.slaveAfterRA);
-		SlaveDatatypeCleanup(V.slaveAfterRA);
-	}
-	if (V.boomerangSlave !== 0) {
-		App.Update.Slave(V.boomerangSlave);
-		App.Entity.Utils.SlaveDataSchemeCleanup(V.boomerangSlave);
-		SlaveDatatypeCleanup(V.boomerangSlave);
-	}
-	if (V.traitor !== 0) {
-		App.Update.Slave(V.traitor);
-		App.Entity.Utils.SlaveDataSchemeCleanup(V.traitor);
-		SlaveDatatypeCleanup(V.traitor);
+	const detachedSlaves = [
+		V.hostage,
+		V.slaveAfterRA,
+		V.boomerangSlave,
+		V.traitor,
+		V.shelterSlave
+	];
+	for (const slave of detachedSlaves) {
+		if (typeof slave !== "undefined" && slave !== 0) {
+			App.Update.Slave(slave);
+			App.Entity.Utils.SlaveDataSchemeCleanup(slave);
+			SlaveDatatypeCleanup(slave);
+		}
 	}
+
 	node.append(`Done!`);
 
 	if (V.incubator.tanks.length > 0) {