diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 7e79fcd6ef5acaf9f833dded6441213546410610..974781a66a478717ae49502c1cae2747a8806376 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1826,12 +1826,8 @@ window.rulesAssistantOptions = (function() {
 		constructor() {
 			const shoes = [];
 			setup.shoes.forEach(acc => {
-				if (acc.fs === undefined && acc.rs === undefined) {
+				if (isClothingAccessible.entry(acc.value, "shoes") === true) {
 					shoes.push([acc.name, acc.value]);
-				} else if (acc.fs === "statuesque" && V.arcologies[0].FSStatuesqueGlorification !== "unset") {
-					shoes.push([`${acc.name} (FS)`, acc.value]);
-				} else if (acc.rs === "shoesBoughtHeels" && V.shoesBoughtHeels === 1) {
-					shoes.push([`${acc.name} (Purchased)`, acc.value]);
 				}
 			});
 			super("Shoes", shoes);
@@ -1844,12 +1840,8 @@ window.rulesAssistantOptions = (function() {
 		constructor() {
 			const bellies = [];
 			setup.bellyAccessories.forEach(acc => {
-				if (acc.fs === undefined && acc.rs === undefined) {
+				if (isClothingAccessible.entry(acc.value, "bellyAccessory") === true) {
 					bellies.push([acc.name, acc.value]);
-				} else if (acc.fs === "repopulation" && V.arcologies[0].FSRepopulationFocus !== "unset") {
-					bellies.push([`${acc.name} (FS)`, acc.value]);
-				} else if (acc.rs === "clothesBoughtBelly" && V.clothesBoughtBelly === 1) {
-					bellies.push([`${acc.name} (Purchased)`, acc.value]);
 				}
 			});
 			super("Corsetage", bellies);
@@ -1996,10 +1988,8 @@ window.rulesAssistantOptions = (function() {
 		constructor() {
 			const accs = [];
 			setup.buttplugs.forEach(acc => {
-				if (acc.fs === undefined && acc.rs === undefined) {
+				if (isClothingAccessible.entry(acc.value, "buttplug") === true) {
 					accs.push([acc.name, acc.value]);
-				} else if (acc.rs === "toysBoughtButtPlugs" && V.toysBoughtButtPlugs === 1) {
-					accs.push([`${acc.name} (Purchased)`, acc.value]);
 				}
 			});
 			super("Buttplugs for anal virgins", accs);
@@ -2012,10 +2002,8 @@ window.rulesAssistantOptions = (function() {
 		constructor() {
 			const accs = [];
 			setup.buttplugs.forEach(acc => {
-				if (acc.fs === undefined && acc.rs === undefined) {
+				if (isClothingAccessible.entry(acc.value, "buttplug") === true) {
 					accs.push([acc.name, acc.value]);
-				} else if (acc.rs === "toysBoughtButtPlugs" && V.toysBoughtButtPlugs === 1) {
-					accs.push([`${acc.name} (Purchased)`, acc.value]);
 				}
 			});
 			super("Buttplugs for other slaves", accs);
@@ -2028,10 +2016,8 @@ window.rulesAssistantOptions = (function() {
 		constructor() {
 			const accs = [];
 			setup.buttplugAttachments.forEach(acc => {
-				if (acc.fs === undefined && acc.rs === undefined) {
+				if (isClothingAccessible.entry(acc.value, "buttplugAttachment") === true) {
 					accs.push([acc.name, acc.value]);
-				} else if (acc.rs === "toysBoughtButtPlugTails" && V.toysBoughtButtPlugTails === 1) {
-					accs.push([`${acc.name} (Purchased)`, acc.value]);
 				}
 			});
 			super("Buttplug attachments for slaves with buttplugs", accs);