:: commit 326bcbfa296b0cce5ecf867dd81b9e1517892d38

diff --git a/CONFIG.md b/CONFIG.md
index 4425b61d..dc17c840 100644
--- a/CONFIG.md
+++ b/CONFIG.md
@@ -62,7 +62,6 @@ Some keys take *URIs* as values; these are described in the next section.
 * `THEME_MARGIN` - Set the amount of margin around the terminal. Ignored if `GRAPHICS` is not `yes`.
 * `THEME_MARGIN_GRADIENT` - Set the thickness in pixel for the gradient around the terminal. Ignored if `GRAPHICS` is not `yes`.
 * `BACKGROUND_PATH` - URI where to find the background .BMP file. Ignored if `GRAPHICS` is not `yes`.
-* `STAGE2_MAP` - URI where to find the stage2 symbol map file for stacktraces and symbol name resolution at runtime.
 * `E9_OUTPUT` - If set to `yes`, output to port 0xe9 for debugging purposes.
 * `COM1_OUTPUT` - If set to `yes`, output to COM1 for debugging purposes.
 
diff --git a/Makefile b/Makefile
index 44614283..72c83ef1 100644
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,9 @@ bootloader: | decompressor stage23
 	cd stage1/pxe && nasm bootsect.asm -fbin -o ../../bin/limine-pxe.bin
 	cp stage23/limine.sys ./bin/
 
-bootloader-clean: stage23-clean decompressor-clean test-clean
+bootloader-clean: stage23-clean decompressor-clean
 
-distclean: clean bootloader-clean
+distclean: clean bootloader-clean test-clean
 	rm -rf bin stivale
 
 tinf-clean:
@@ -56,7 +56,7 @@ decompressor-clean:
 
 test-clean:
 	$(MAKE) -C test clean
-	rm -f test/limine.map test.hdd
+	rm -rf test_image test.hdd test.iso
 
 toolchain:
 	cd toolchain && ./make_toolchain.sh -j`nproc`
@@ -67,7 +67,7 @@ test.hdd:
 	parted -s test.hdd mklabel gpt
 	parted -s test.hdd mkpart primary 2048s 100%
 
-echfs-test: test.hdd bootloader | all
+echfs-test: | test-clean test.hdd bootloader all
 	$(MAKE) -C test
 	echfs-utils -g -p0 test.hdd quick-format 512 > part_guid
 	sed "s/@GUID@/`cat part_guid`/g" < test/limine.cfg > limine.cfg.tmp
@@ -80,7 +80,7 @@ echfs-test: test.hdd bootloader | all
 	bin/limine-install test.hdd
 	qemu-system-x86_64 -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio
 
-ext2-test: test.hdd bootloader | all
+ext2-test: | test-clean test.hdd bootloader all
 	$(MAKE) -C test
 	rm -rf test_image/
 	mkdir test_image
@@ -97,7 +97,7 @@ ext2-test: test.hdd bootloader | all
 	bin/limine-install test.hdd
 	qemu-system-x86_64 -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio
 
-fat32-test: test.hdd bootloader | all
+fat32-test: | test-clean test.hdd bootloader all
 	$(MAKE) -C test
 	rm -rf test_image/
 	mkdir test_image
@@ -114,7 +114,7 @@ fat32-test: test.hdd bootloader | all
 	bin/limine-install test.hdd
 	qemu-system-x86_64 -net none -smp 4 -enable-kvm -cpu host -hda test.hdd -debugcon stdio
 
-iso9660-test: bootloader
+iso9660-test: | test-clean test.hdd bootloader all
 	$(MAKE) -C test
 	rm -rf test_image/
 	mkdir -p test_image/boot
diff --git a/stage23/Makefile b/stage23/Makefile
index 32609b65..3a541137 100644
--- a/stage23/Makefile
+++ b/stage23/Makefile
@@ -73,4 +73,4 @@ limine.elf: $(OBJ) limine.map.o
 	nasm $< -f elf32 -o $@
 
 clean:
-	rm -f symlist.gen limine.elf limine.sys stage2.bin stage2.bin.gz $(OBJ) $(HEADER_DEPS)
+	rm -f limine.elf limine_nomap.elf limine.map.o limine.sys stage2.bin stage2.bin.gz $(OBJ) $(HEADER_DEPS)
diff --git a/stage23/lib/config.c b/stage23/lib/config.c
index d4c006d6..ebc92c7c 100644
--- a/stage23/lib/config.c
+++ b/stage23/lib/config.c
@@ -27,9 +27,6 @@ int init_config_disk(struct volume *part) {
             panic("Could not open stage 3");
         }
 
-        print("%x %x %x\n", stage3_addr, (uintptr_t)stage3_addr - 0x8000,
-              stage3.size - (uintptr_t)stage3_addr - 0x8000);
-
         fread(&stage3, stage3_addr,
               (uintptr_t)stage3_addr - 0x8000,
               stage3.size - ((uintptr_t)stage3_addr - 0x8000));
diff --git a/test/limine.cfg b/test/limine.cfg
index 263998ca..28804a14 100644
--- a/test/limine.cfg
+++ b/test/limine.cfg
@@ -1,11 +1,9 @@
-MENU_BRANDING=Limine's test image
 DEFAULT_ENTRY=2
 TIMEOUT=3
 GRAPHICS=yes
 MENU_RESOLUTION=1024x768
 MENU_FONT=boot:///boot/font.bin
 E9_OUTPUT=yes
-STAGE2_MAP=boot:///boot/limine.map
 
 THEME_COLOURS=60000000;aa0000;00aaff;aa5500;0000aa;aa00aa;9076de;aaaaaa
 THEME_MARGIN=64