diff --git a/levels/amarande/map05_fix.txt b/levels/amarande/map05_fix.txt
deleted file mode 100644
index ef5855d5..00000000
--- a/levels/amarande/map05_fix.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-map05_fix.wad
-
-This is a version of Freedoom MAP05 tweaked to remove ZDoom-exclusive co-op
-player starts.  (Seriously, ZDoom stuff in a Boom level!?)  Hopefully, there
-will be no more "unknown thing" errors on this map.
-
-Enjoy!
-
-- Eric "The Green Herring" Baker -
-- eabaker@san.rr.com -
-- March 15, 2008 -
\ No newline at end of file
diff --git a/levels/amarande/map05_fix.wad b/levels/amarande/map05_fix.wad
deleted file mode 100644
index 65e7403f..00000000
Binary files a/levels/amarande/map05_fix.wad and /dev/null differ
diff --git a/levels/amarande/map21.txt b/levels/amarande/map21.txt
deleted file mode 100644
index 384df0da..00000000
--- a/levels/amarande/map21.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-MAP21 - Patrick Kalinauskas (Amarande) (avarvae@concentric.net)
-
diff --git a/levels/amarande/map21.wad b/levels/amarande/map21.wad
deleted file mode 100644
index 1794b198..00000000
Binary files a/levels/amarande/map21.wad and /dev/null differ
diff --git a/levels/amarande/map27.wad b/levels/amarande/map27.wad
deleted file mode 100644
index 4e9ee9fe..00000000
Binary files a/levels/amarande/map27.wad and /dev/null differ
diff --git a/levels/amarande/map29.txt b/levels/amarande/map29.txt
deleted file mode 100644
index 1cc0b1cb..00000000
--- a/levels/amarande/map29.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-MAP29 - Patrick Kalinauskas (Amarande) (avarvae@concentric.net)
-
-Updated version. ZDoom testers reported that the originally uploaded
-version of MAP29 had an excessively difficult jump to the teleporter
-pad on the green torch platform (out the window from the backpack lift);
-also, this version contains deathmatch starts, which were omitted in the
-initial upload.
-
diff --git a/levels/amarande/map29.wad b/levels/amarande/map29.wad
deleted file mode 100644
index cef6d2bc..00000000
Binary files a/levels/amarande/map29.wad and /dev/null differ
diff --git a/levels/map05.wad b/levels/map05.wad
deleted file mode 120000
index 8f5551c0..00000000
--- a/levels/map05.wad
+++ /dev/null
@@ -1 +0,0 @@
-amarande/map05_fix.wad
\ No newline at end of file
diff --git a/levels/map05.wad b/levels/map05.wad
new file mode 100644
index 00000000..65e7403f
Binary files /dev/null and b/levels/map05.wad differ
diff --git a/levels/map21.wad b/levels/map21.wad
deleted file mode 120000
index 25074510..00000000
--- a/levels/map21.wad
+++ /dev/null
@@ -1 +0,0 @@
-amarande/map21.wad
\ No newline at end of file
diff --git a/levels/map21.wad b/levels/map21.wad
new file mode 100644
index 00000000..1794b198
Binary files /dev/null and b/levels/map21.wad differ
diff --git a/levels/map27.wad b/levels/map27.wad
deleted file mode 120000
index 4c58aaee..00000000
--- a/levels/map27.wad
+++ /dev/null
@@ -1 +0,0 @@
-amarande/map27.wad
\ No newline at end of file
diff --git a/levels/map27.wad b/levels/map27.wad
new file mode 100644
index 00000000..4e9ee9fe
Binary files /dev/null and b/levels/map27.wad differ
diff --git a/levels/map29.wad b/levels/map29.wad
deleted file mode 120000
index 55ff87b3..00000000
--- a/levels/map29.wad
+++ /dev/null
@@ -1 +0,0 @@
-amarande/map29.wad
\ No newline at end of file
diff --git a/levels/map29.wad b/levels/map29.wad
new file mode 100644
index 00000000..cef6d2bc
Binary files /dev/null and b/levels/map29.wad differ
diff --git a/lumps/amarande/dm25.lmp b/lumps/amarande/dm25.lmp
deleted file mode 100644
index d53ca772..00000000
Binary files a/lumps/amarande/dm25.lmp and /dev/null differ
diff --git a/lumps/demo2_dm.lmp b/lumps/demo2_dm.lmp
deleted file mode 120000
index d1e10da8..00000000
--- a/lumps/demo2_dm.lmp
+++ /dev/null
@@ -1 +0,0 @@
-amarande/dm25.lmp
\ No newline at end of file
diff --git a/lumps/demo2_dm.lmp b/lumps/demo2_dm.lmp
new file mode 100644
index 00000000..d53ca772
Binary files /dev/null and b/lumps/demo2_dm.lmp differ