diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index aa1d81ee866af2e72c633dcfa80b2537e7ea29c1..52f5e1696568884aa6dfe11e6b74e877bf1a76a1 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -199,27 +199,8 @@ App.Facilities.Farmyard.farmyard = function() {
 		desc.append(link);
 		frag.append(desc);
 
-		if (V.farmyardFarmers || V.farmyardShowgirls) {
-			const
-				removeLink = App.UI.DOM.makeElement("div", '', "indent"),
-				warning = App.UI.DOM.makeElement("span", '', "red"),
-
-				count = App.Entity.facilities.farmyard.totalEmployeesCount,
-				newPop = count + V.dormitoryPopulation;
-
-			warning.append(` Dormitory capacity will be exceeded.`);
-
-			removeLink.append(App.UI.DOM.passageLink("Remove all slaves", "Farmyard", () => {
-				App.Utils.moveFacilityWorkers(App.Entity.facilities.farmyard);
-			}));
-
-			if (newPop > V.dormitory) {
-				removeLink.append(warning);
-			}
-
-			if (App.Entity.facilities.farmyard.totalEmployeesCount) {
-				frag.append(removeLink);
-			}
+		if (App.Entity.facilities.farmyard.totalEmployeesCount) {
+			App.UI.DOM.appendNewElement("div", frag, removeFacilityWorkers("farmyard"), "indent");
 		}
 
 		return frag;
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index afa7af0ecaa0d537774ba212279e1946f8a7fbed..0be04b066f9e75af32cf6c5f27943415b75445ee 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -952,8 +952,8 @@ globalThis.assignmentTransition = function(slave, assignTo, passage) {
 /**
  * Creates a link that will remove all slaves from a facility, including manager.
  * @param {string} facilityName
- * @param {string} managerAssignment
- * @param {string} workerAssignment
+ * @param {string} [managerAssignment]
+ * @param {string} [workerAssignment]
  * @returns {Node}
  */
 globalThis.removeFacilityWorkers = function(facilityName, managerAssignment, workerAssignment) {