diff --git a/attic/unused.cfg b/attic/unused.cfg
index 45f9f3384c0..476fc1cc5c7 100644
--- a/attic/unused.cfg
+++ b/attic/unused.cfg
@@ -41,3 +41,32 @@
     [/event]
 #enddef
 
+#
+# Originally from UtBS -- it now has a random-placement macro that
+# is probably better than this.
+#
+
+#!***Macro to random place unit within area***
+#define RANDOM_PLACEMENT X Y RADIUS_NUMBER UNIT_WML
+    [store_locations]
+        x,y={X},{Y}
+        radius={RADIUS_NUMBER}
+        variable=random_placement_locations
+    [/store_locations]
+
+    {VARIABLE_OP random_string format "0..$random_placement_locations.length"}
+
+    {RANDOM $random_string}
+
+    {VARIABLE_OP random_placement_x format "$random_placement_locations[$random].x"}
+    {VARIABLE_OP random_placement_y format "$random_placement_locations[$random].y"}
+
+    {CLEAR_VARIABLE random_placement_locations}
+
+    {UNIT_WML}
+
+    [+unit]
+        x,y=$random_placement_x,$random_placement_y
+    [/unit]
+#enddef
+
diff --git a/data/campaigns/Under_the_Burning_Suns/images/items/coffin2.png b/data/campaigns/Under_the_Burning_Suns/images/items/coffin2.png
deleted file mode 100644
index 5ee14874c8f..00000000000
Binary files a/data/campaigns/Under_the_Burning_Suns/images/items/coffin2.png and /dev/null differ
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
index 2756592a2f3..d3aa915f66f 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
@@ -309,7 +309,7 @@
         [/if]
 
         #secret troll tomb furnishings
-        {PLACE_IMAGE items/coffin2.png 3 28}
+        {PLACE_IMAGE items/coffin-closed.png 3 28}
         {PLACE_IMAGE items/bones.png 6 24}
 
         #troll burial grounds furnishings
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
index c094c1741ca..a732a89b13b 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
@@ -392,8 +392,8 @@
 
         #secret tomb furnishings
         {PLACE_IMAGE items/rune-violet2.png 61 21}
-        {PLACE_IMAGE items/coffin2.png 65 24}
-        {PLACE_IMAGE items/coffin2.png 19 97}
+        {PLACE_IMAGE items/coffin-closed.png 65 24}
+        {PLACE_IMAGE items/coffin-closed.png 19 97}
 
         #recall heroes
         [recall]
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index 11bd95ff4a1..609ca403974 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -383,6 +383,13 @@
         # golem trapped in magic circle
         {PLACE_IMAGE flesh-golem.png 18 29}
 
+        # Miscellaneous potions
+        {PLACE_IMAGE items/potion-poison.png 18 27}
+        {PLACE_IMAGE items/potion-red.png 17 28}
+        {PLACE_IMAGE items/potion-grey.png 19 28}
+        {PLACE_IMAGE items/potion-yellow.png 16 29}
+        {PLACE_IMAGE items/potion-green.png 20 29}
+
         # wizard's dragon statues
         {PLACE_IMAGE items/dragonstatue.png 16 28}
         {PLACE_IMAGE items/dragonstatue.png 20 28}
@@ -413,10 +420,10 @@
         {PLACE_IMAGE items/bones.png 12 42}
 
         # crypt coffins + rocks
-        {PLACE_IMAGE items/coffin2.png 10 26}
-        {PLACE_IMAGE items/coffin2.png 10 28}
-        {PLACE_IMAGE items/coffin2.png 12 25}
-        {PLACE_IMAGE items/coffin2.png 12 27}
+        {PLACE_IMAGE items/coffin-closed.png 10 26}
+        {PLACE_IMAGE items/coffin-closed.png 10 28}
+        {PLACE_IMAGE items/coffin-closed.png 12 25}
+        {PLACE_IMAGE items/coffin-closed.png 12 27}
         {PLACE_IMAGE scenery/rubble.png 12 28}
 
         # cloaked figure chamber
diff --git a/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg b/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
index 5dd2a8fcd44..64811d7c74a 100644
--- a/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
@@ -62,30 +62,6 @@
     {CLEAR_VARIABLE random_placement_locations}
 #enddef
 
-#!***Macro to random place unit within area***
-#define RANDOM_PLACEMENT X Y RADIUS_NUMBER UNIT_WML
-    [store_locations]
-        x,y={X},{Y}
-        radius={RADIUS_NUMBER}
-        variable=random_placement_locations
-    [/store_locations]
-
-    {VARIABLE_OP random_string format "0..$random_placement_locations.length"}
-
-    {RANDOM $random_string}
-
-    {VARIABLE_OP random_placement_x format "$random_placement_locations[$random].x"}
-    {VARIABLE_OP random_placement_y format "$random_placement_locations[$random].y"}
-
-    {CLEAR_VARIABLE random_placement_locations}
-
-    {UNIT_WML}
-
-    [+unit]
-        x,y=$random_placement_x,$random_placement_y
-    [/unit]
-#enddef
-
 #***Macro that will unclutter scenarios somewhat***
 #define ADD VAR AMOUNT
     [set_variable]
diff --git a/data/core/macros/sound-utils.cfg b/data/core/macros/sound-utils.cfg
index 98ba5faa89c..1ece0af6ec5 100644
--- a/data/core/macros/sound-utils.cfg
+++ b/data/core/macros/sound-utils.cfg
@@ -302,9 +302,6 @@
 #define SOUND_LIST:ZOMBIE_HIT
     zombie-hit-1.ogg,zombie-hit-2.ogg,zombie-hit-3.ogg,zombie-hit-4.ogg,zombie-hit-5.ogg,zombie-hit-6.ogg #enddef
 
-#define SOUND_LIST:ZOMBIE_STRONG_HIT
-    zombie-hit-1.ogg,zombie-hit-2.ogg,zombie-hit-3.ogg #enddef
-
 #define SOUND:SLOW
     # A convenient way to use the standard slowing sound in an attack
     # animation. Put anywhere inside an attack animation block.