diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js
index d8998fa7be779fa97a74b77d2ef90a9a46781b2c..b895d9359752ac673a73534714915ff03c0de088 100644
--- a/src/facilities/farmyard/reports/farmyardReport.js
+++ b/src/facilities/farmyard/reports/farmyardReport.js
@@ -276,9 +276,9 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
 			}
 
 			$(farmerEntry).append(`<span class="slave-name">${SlaveFullName(Farmer)}</span> is serving as the Farmer.`);
-			$(farmerEntry).append(standardSlaveReport(Farmer, false));
+			$(farmerEntry).append(App.SlaveAssignment.standardSlaveReport(Farmer, false));
 		} else {
-			standardSlaveReport(Farmer, true);
+			App.SlaveAssignment.standardSlaveReport(Farmer, true);
 		}
 
 		farmerChanges();
@@ -402,10 +402,10 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
 					farmhandContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent");
 
 				$(farmhandContent).append(`${He} ${App.SlaveAssignment.workTheFarm(slave, farmerBonus)}`);
-				$(slaveEntry).append(standardSlaveReport(slave, false));
+				$(slaveEntry).append(App.SlaveAssignment.standardSlaveReport(slave, false));
 			} else {	// silently discard return values
 				App.SlaveAssignment.workTheFarm(slave, farmerBonus);
-				standardSlaveReport(slave, true);
+				App.SlaveAssignment.standardSlaveReport(slave, true);
 			}
 		}
 
@@ -530,36 +530,5 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
 	frag.append(App.Facilities.Farmyard.Stats(false));
 	statsSpan.append(App.Facilities.Farmyard.Stats(true));
 
-
-	// TODO: move this into seperate file
-	/**
-	 * Generates (and returns if not silent) a standard slave report
-	 * @param {App.Entity.SlaveState} slave
-	 * @param {boolean} silent
-	 * @returns {HTMLElement|null}
-	 */
-	function standardSlaveReport(slave, silent) {
-		const
-			clothes = App.SlaveAssignment.choosesOwnClothes(slave);
-			tired(slave);
-
-		const
-			rules = App.UI.DOM.renderPassage("SA rules"),
-			diet = App.UI.DOM.renderPassage("SA diet"),
-			ltEffects = App.UI.DOM.renderPassage("SA long term effects"),
-			drugs = App.SlaveAssignment.drugs(slave),
-			relationships = App.UI.DOM.renderPassage("SA relationships"),
-			rivalries = App.UI.DOM.renderPassage("SA rivalries"),
-			devotion = App.UI.DOM.renderPassage("SA devotion");
-
-		if (!silent) {
-			const content = App.UI.DOM.makeElement("div", '', "indent");
-
-			$(content).append(clothes, rules, diet, ltEffects, drugs, relationships, rivalries, document.createElement('br'), devotion);
-
-			return content;
-		}
-	}
-
 	return frag;
 };