diff --git a/etc/Mods,WIP/1.nonworking/homedecor_censorship/README.txt b/etc/Mods,WIP-nonworking/homedecor_censorship/README.txt
similarity index 100%
rename from etc/Mods,WIP/1.nonworking/homedecor_censorship/README.txt
rename to etc/Mods,WIP-nonworking/homedecor_censorship/README.txt
diff --git a/etc/Mods,WIP/1.nonworking/homedecor_censorship/depends.txt b/etc/Mods,WIP-nonworking/homedecor_censorship/depends.txt
similarity index 100%
rename from etc/Mods,WIP/1.nonworking/homedecor_censorship/depends.txt
rename to etc/Mods,WIP-nonworking/homedecor_censorship/depends.txt
diff --git a/etc/Mods,WIP/1.nonworking/homedecor_censorship/init.lua b/etc/Mods,WIP-nonworking/homedecor_censorship/init.lua
similarity index 100%
rename from etc/Mods,WIP/1.nonworking/homedecor_censorship/init.lua
rename to etc/Mods,WIP-nonworking/homedecor_censorship/init.lua
diff --git a/etc/change_hardcoded_world_name_first/game-install-ENLIVEN b/etc/change_hardcoded_world_name_first/game-install-ENLIVEN
index c663be7..0eb0b51 100755
--- a/etc/change_hardcoded_world_name_first/game-install-ENLIVEN
+++ b/etc/change_hardcoded_world_name_first/game-install-ENLIVEN
@@ -11,16 +11,6 @@
 
 # * Git version uses /home/*/minetest/games and /usr/local/share/minetest/games but the latter is used for minetestserver (minetest-server package)
 # Known Issues:
-# * Must do the following if runs twice (run a third time to fix it):
-if [ -d /usr/share/minetest/games/ENLIVEN/mods/3d_armor/minetest-3d_armor-master ]; then
-  rm -Rf /usr/share/minetest/games/ENLIVEN/mods/3d_armor
-fi
-if [ -d /usr/share/minetest/games/ENLIVEN/mods/3d_armor/minetest-3d_armor-master ]; then
-  rm -Rf /usr/share/minetest/games/ENLIVEN/mods/3d_armor
-fi
-if [ -d /usr/share/minetest/games/ENLIVEN/mods/plantlife_modpack/plantlife_modpack-master ]; then
-  rm -Rf /usr/share/minetest/games/ENLIVEN/mods/plantlife_modpack
-fi
 Uberi=`ls /usr/share/minetest/games/ENLIVEN/mods/worldedit | grep Uberi`
 if [ ! -z "$Uberi" ]; then
   # /usr/share/minetest/games/ENLIVEN/mods/worldedit/Uberi-Minetest-WorldEdit-3322ef9
@@ -748,6 +738,9 @@ MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME
 if [ -d "$MTMOD_UNZ_NAME" ]; then
   rm -Rf "$MTMOD_UNZ_NAME"
 fi
+if [ -d "$MTMOD_DEST_PATH" ]; then
+  rm -Rf "$MTMOD_DEST_PATH"
+fi
 if [ -f "$MTMOD_DL_ZIP" ]; then
   rm -f "$MTMOD_DL_ZIP"
 fi
@@ -868,6 +861,9 @@ MTMOD_DEST_PATH=$MT_MYGAME_MODS_PATH/$MTMOD_DEST_NAME
 if [ -d "$MTMOD_UNZ_NAME" ]; then
   rm -Rf "$MTMOD_UNZ_NAME"
 fi
+if [ -d "$MTMOD_DEST_PATH" ]; then
+  rm -Rf "$MTMOD_DEST_PATH"
+fi
 if [ -f "$MTMOD_DL_ZIP" ]; then
   rm -f "$MTMOD_DL_ZIP"
 fi