diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 43832bae36694fc63c7c9eb17eb96405496fb541..afefb47380b49f6355f41269ac5bd6f842d3546e 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -505,9 +505,6 @@ You should have received a copy of the GNU General Public License along with thi
 <<set $dairyPregSettingChanged = 0>>
 <<set $dairyRestraintsUpgrade = 0>>
 <<set $dairyRestraintsSetting = 0>>
-<<silently>>
-	DairyRestraintsSetting($dairyRestraintsSetting)
-<</silently>>
 <<set $dairySlimMaintainUpgrade = 0>>
 <<set $dairySlimMaintain = 0>>
 <<set $dairyHyperPregRemodel = 0>>
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index eab6e9b9c524535197b8280c3867120966e58c91..368227ad92dde2ff3a5297f94d6dcb712645377c 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -202,24 +202,13 @@ window.isSlaveAvailable = /** @param {App.Entity.SlaveState} slave */ function (
 		return false;
 	} else if (slave.assignment === "be confined in the arcade") {
 		return false;
-	} else if (slave.assignment === "work in the dairy" && State.variables.DairyRestraintsSetting >= 2) {
+	} else if (slave.assignment === "work in the dairy" && State.variables.dairyRestraintsSetting >= 2) {
 		return false;
 	} else {
 		return true;
 	}
 };
 
-if (typeof DairyRestraintsSetting === "undefined") {
-	var DairyRestraintsSetting = {
-		setSetting: function (setting) {
-			setting = Number(setting);
-			return setting;
-		}
-	};
-	// Raise namespace scope to Global.
-	window.DairyRestraintsSetting = DairyRestraintsSetting;
-}
-
 /* OLD
 window.randomRelatedSlave = function(slave, filterFunction) {
 	if(!slave || !SugarCube) { return undefined; }
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 1c66d62ab5ef37eb161ba818de7639395b3e8058..42124482003092bec6d136a017f51a8eba0365fd 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -775,6 +775,22 @@ window.GenerateNewSlave = (function(){
 	}
 
 	function generateXXBoobs() {
+		function rollBreast(modif) {
+			const volume = [0, 300, 500, 650, 800, 1000, 1200, 1400, 1600, 1800, 2050, 2300, 2600, 2900, 3250, 3600, 3950, 4300, 4700, 5100, 5500, 5900];
+			const volume_dist = [90000, 470000, 720000, 840000, 908574, 947759, 970151, 982946, 990258, 994436, 996824, 998188, 998968, 999414, 999669, 999814, 999897, 999945, 999972, 999987, 999995, 1000000];
+			const randomRoll = Math.floor(Math.random() * 1000000) + 1;
+			let actualSize = 0;
+			let minorSizeAdjustment = 0;
+
+			while (randomRoll > volume_dist[actualSize]) {
+				actualSize = actualSize + 1;
+			}
+			if (Math.random() < 0.5) {
+				minorSizeAdjustment = (Math.floor(Math.random() * 2) + 1) * 50;
+			}
+			return Math.max(volume[actualSize] + minorSizeAdjustment + modif, 0);
+		}
+
 		if (slave.physicalAge <= 10) {
 			slave.boobs = 100;
 		} else if (slave.physicalAge === 11) {
@@ -790,16 +806,16 @@ window.GenerateNewSlave = (function(){
 		} else {
 			switch (slave.race) {
 				case "black":
-					slave.boobs = BoobGenerator.rollBreast(150);
+					slave.boobs = rollBreast(150);
 					break;
 				case "white":
-					slave.boobs = BoobGenerator.rollBreast(50);
+					slave.boobs = rollBreast(50);
 					break;
 				case "asian":
-					slave.boobs = BoobGenerator.rollBreast(-100);
+					slave.boobs = rollBreast(-100);
 					break;
 				default:
-					slave.boobs = BoobGenerator.rollBreast(0);
+					slave.boobs = rollBreast(0);
 			}
 		}
 	}
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 2bb7350e8bde02102ea6a93d8bac0d63013aabc6..4c472fac53b71ce4970daf66f25dc129baf06467 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -47,32 +47,6 @@ window.isFullyPotent = /** @param {App.Entity.SlaveState} slave */ function (sla
 	}
 };
 
-/**
- * BoobGenerator namespace.
- */
-if (typeof BoobGenerator === "undefined") {
-	var BoobGenerator = {
-		rollBreast: function (modif) {
-			var volume = [0, 300, 500, 650, 800, 1000, 1200, 1400, 1600, 1800, 2050, 2300, 2600, 2900, 3250, 3600, 3950, 4300, 4700, 5100, 5500, 5900];
-			var volume_dist = [90000, 470000, 720000, 840000, 908574, 947759, 970151, 982946, 990258, 994436, 996824, 998188, 998968, 999414, 999669, 999814, 999897, 999945, 999972, 999987, 999995, 1000000];
-			var randomRoll = Math.floor(Math.random() * 1000000) + 1;
-			var actualSize = 0;
-			while (randomRoll > volume_dist[actualSize]) {
-				actualSize = actualSize + 1;
-			}
-			var minorSizeAdjustment = 0;
-			if (Math.random()<.5) {
-				minorSizeAdjustment = (Math.floor(Math.random() * 2) + 1) * 50;
-			}
-			var volResult = volume[actualSize] + minorSizeAdjustment + modif;
-			if (volResult < 0) { volResult = 0;}
-			return volResult;
-		}
-	};
-	// Raise namespace scope to Global.
-	window.BoobGenerator = BoobGenerator;
-}
-
 window.removeFromArray = function(arr, val) {
 	for (var i = 0; i < arr.length; i++) {
 		if (val === arr[i])
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 714058846198be1fe1c4dc681482ea73f6042067..b2724f12dda02ed73c16b74b0e21414177031114 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -2,10 +2,6 @@
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _SL = $slaves.length>>
 
-<<silently>>
-DairyRestraintsSetting($dairyRestraintsSetting)
-<</silently>>
-
 <<SlaveSort $DairyiIDs>>
 <<set _DL = $DairyiIDs.length, $dairySlaves = _DL>>
 <<dairyAssignmentFilter>>