diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index 43d2f65465832daa6e705e551829b3e3ca390baf..6699519093f5a114c16459b860afb3e4d946b48d 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/game/modules/tome/data/birth/descriptors.lua
@@ -57,7 +57,7 @@ newBirthDescriptor{
 	},
 	talents = {},
 	experience = 1.0,
-	body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1, MOUNT = 1 },
+	body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1 },
 
 	copy = {
 		-- Some basic stuff
diff --git a/game/modules/tome/data/general/objects/objects.lua b/game/modules/tome/data/general/objects/objects.lua
index cdf86283a8525849f4a206709777be2be711519a..d3be9fcf7c2b0f4d15474bb8174d385c9feb4bea 100644
--- a/game/modules/tome/data/general/objects/objects.lua
+++ b/game/modules/tome/data/general/objects/objects.lua
@@ -76,9 +76,6 @@ loadIfNot("/data/general/objects/gauntlets.lua")
 loadIfNot("/data/general/objects/cloak.lua")
 loadIfNot("/data/general/objects/leather-belt.lua")
 
--- Mounts
-loadIfNot("/data/general/objects/mounts.lua")
-
 -- Lore
 loadIfNot("/data/general/objects/lore/spellhunt.lua")
 loadIfNot("/data/general/objects/lore/fun.lua")
diff --git a/game/modules/tome/data/general/objects/potions.lua b/game/modules/tome/data/general/objects/potions.lua
index f77b90d61a21229451112cf863710ead993113bd..31c0558794f140481438ebcc4ee7c6a4446f3740 100644
--- a/game/modules/tome/data/general/objects/potions.lua
+++ b/game/modules/tome/data/general/objects/potions.lua
@@ -19,7 +19,6 @@
 
 newEntity{
 	define_as = "BASE_POTION",
-	slot = "INBELT", use_no_wear=true,
 	type = "potion", subtype="potion",
 	unided_name = "potion", id_by_type = true,
 	display = "!", color=colors.WHITE, image="object/potion-0x0.png",
diff --git a/game/modules/tome/data/general/objects/scrolls.lua b/game/modules/tome/data/general/objects/scrolls.lua
index b84479c3bee3c7a9ad9e58da6dd1e6df565b0e9a..cc6c06735c576836250ac3a34acfab833b56dfb6 100644
--- a/game/modules/tome/data/general/objects/scrolls.lua
+++ b/game/modules/tome/data/general/objects/scrolls.lua
@@ -19,7 +19,6 @@
 
 newEntity{
 	define_as = "BASE_SCROLL",
-	slot = "INBELT", use_no_wear=true,
 	type = "scroll", subtype="scroll",
 	unided_name = "scroll", id_by_type = true,
 	display = "?", color=colors.WHITE, image="object/scroll.png",
diff --git a/game/modules/tome/data/zones/golem-graveyard/npcs.lua b/game/modules/tome/data/zones/golem-graveyard/npcs.lua
index 3af4727b58ef00bd79ef9e300dca8a0ffb4d11d1..a413661437bd2f92b5ee2fe572d51c0d37704b91 100644
--- a/game/modules/tome/data/zones/golem-graveyard/npcs.lua
+++ b/game/modules/tome/data/zones/golem-graveyard/npcs.lua
@@ -32,7 +32,7 @@ newEntity{ define_as = "ATAMATHON", base = "BASE_NPC_CONSTRUCT",
 	max_life = 350, life_rating = 40, fixed_rating = true,
 	life_regen = 0,
 	stats = { str=35, dex=10, cun=8, mag=30, con=30 },
-	rank = 3.5,
+	rank = 5,
 	size_category = 5,
 	infravision = 10,
 	instakill_immune = 1,
diff --git a/game/modules/tome/data/zones/ring-of-blood/npcs.lua b/game/modules/tome/data/zones/ring-of-blood/npcs.lua
index 258b0a77ada4a6443d88ebcdf124856e08b0fc21..091e757e0c2680d781dc5239adb7b79e13ec9a9b 100644
--- a/game/modules/tome/data/zones/ring-of-blood/npcs.lua
+++ b/game/modules/tome/data/zones/ring-of-blood/npcs.lua
@@ -109,7 +109,7 @@ newEntity{ define_as = "PLAYER_SLAVE",
 	move_others=true,
 	suppress_alchemist_drops = true,
 
-	body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1, MOUNT = 1 },
+	body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1 },
 	resolvers.equip{
 		{type="armor", subtype="hands", autoreq=true},
 		{type="armor", subtype="light", autoreq=true},