diff --git a/fuzzers/fuzzbench/Makefile b/fuzzers/fuzzbench/Makefile
deleted file mode 100644
index c412cb2f42..0000000000
--- a/fuzzers/fuzzbench/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-FUZZER_NAME="fuzzer"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-
-PHONY: all
-
-all: fuzzer
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-target/release/libafl_cc: target/release/libafl_cxx
-
-fuzz.o: fuzz.c target/release/libafl_cc
-	target/release/libafl_cc --libafl-no-link -O3 -c $^ -o $@
-
-fuzzer: target/release/libafl_cxx fuzz.o
-	# Build the fuzzer compiler
-	cargo build --release
-
-	# Build the harness	
-	target/release/libafl_cxx \
-	  --libafl \
-		fuzz.o \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-clean:
-	rm ./$(FUZZER_NAME) || true
-	rm fuzz.o || true
-
-run: all
-	./$(FUZZER_NAME)
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	mkdir in || true
-	echo a > in/a
-	# Allow sigterm as exit code 
-	(timeout 11s ./$(FUZZER_NAME) -o out -i in || [ $$? -eq 124 ])
-	rm -rf out || true
-	rm -rf in || true
-
-test: all
-	mkdir in || true
-	echo a > in/a
-	(timeout 60s ./$(FUZZER_NAME) -o out -i in || [ $$? -eq 124 ])
-	rm -rf out || true
-	rm -rf in || true
diff --git a/fuzzers/fuzzbench_fork_qemu/Makefile b/fuzzers/fuzzbench_fork_qemu/Makefile
deleted file mode 100644
index a1c3e4ab6a..0000000000
--- a/fuzzers/fuzzbench_fork_qemu/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-FUZZER_NAME="libpng_harness"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-libpng-1.6.37:
-	wget https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz
-	tar -xvf libpng-1.6.37.tar.xz
-
-target/release/fuzzbench_qemu: src/*
-	cargo build --release
-
-libpng-1.6.37/.libs/libpng16.a: libpng-1.6.37
-	cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
-	$(MAKE) -C libpng-1.6.37
-	cc -c $(PROJECT_DIR)/libfuzzer_main.c
-	# Build the libpng harness	
-	c++ \
-		$(PROJECT_DIR)/../libfuzzer_libpng/harness.cc \
-		$(PROJECT_DIR)/libpng-1.6.37/.libs/libpng16.a \
-		libfuzzer_main.o \
-		-I$(PROJECT_DIR)/libpng-1.6.37/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-fuzzer: target/release/fuzzbench_qemu libpng-1.6.37/.libs/libpng16.a
-
-clean:
-	rm ./$(FUZZER_NAME) libfuzzer_main.o
-	$(MAKE) -C libpng-1.6.37 clean
-
-run: all
-	cargo run --release -- --libafl-in ../libfuzzer_libpng/corpus --libafl-out ./out ./$(FUZZER_NAME)
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 10s cargo run --release -- --libafl-in ../libfuzzer_libpng/corpus --libafl-out ./out ./$(FUZZER_NAME) &
-
-test: all
-	timeout 60s cargo run --release -- --libafl-in ../libfuzzer_libpng/corpus --libafl-out ./out ./$(FUZZER_NAME) &
diff --git a/fuzzers/fuzzbench_qemu/Makefile b/fuzzers/fuzzbench_qemu/Makefile
deleted file mode 100644
index a1c3e4ab6a..0000000000
--- a/fuzzers/fuzzbench_qemu/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-FUZZER_NAME="libpng_harness"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-libpng-1.6.37:
-	wget https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz
-	tar -xvf libpng-1.6.37.tar.xz
-
-target/release/fuzzbench_qemu: src/*
-	cargo build --release
-
-libpng-1.6.37/.libs/libpng16.a: libpng-1.6.37
-	cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
-	$(MAKE) -C libpng-1.6.37
-	cc -c $(PROJECT_DIR)/libfuzzer_main.c
-	# Build the libpng harness	
-	c++ \
-		$(PROJECT_DIR)/../libfuzzer_libpng/harness.cc \
-		$(PROJECT_DIR)/libpng-1.6.37/.libs/libpng16.a \
-		libfuzzer_main.o \
-		-I$(PROJECT_DIR)/libpng-1.6.37/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-fuzzer: target/release/fuzzbench_qemu libpng-1.6.37/.libs/libpng16.a
-
-clean:
-	rm ./$(FUZZER_NAME) libfuzzer_main.o
-	$(MAKE) -C libpng-1.6.37 clean
-
-run: all
-	cargo run --release -- --libafl-in ../libfuzzer_libpng/corpus --libafl-out ./out ./$(FUZZER_NAME)
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 10s cargo run --release -- --libafl-in ../libfuzzer_libpng/corpus --libafl-out ./out ./$(FUZZER_NAME) &
-
-test: all
-	timeout 60s cargo run --release -- --libafl-in ../libfuzzer_libpng/corpus --libafl-out ./out ./$(FUZZER_NAME) &
diff --git a/fuzzers/fuzzbench_text/Makefile b/fuzzers/fuzzbench_text/Makefile
deleted file mode 100644
index c412cb2f42..0000000000
--- a/fuzzers/fuzzbench_text/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-FUZZER_NAME="fuzzer"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-
-PHONY: all
-
-all: fuzzer
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-target/release/libafl_cc: target/release/libafl_cxx
-
-fuzz.o: fuzz.c target/release/libafl_cc
-	target/release/libafl_cc --libafl-no-link -O3 -c $^ -o $@
-
-fuzzer: target/release/libafl_cxx fuzz.o
-	# Build the fuzzer compiler
-	cargo build --release
-
-	# Build the harness	
-	target/release/libafl_cxx \
-	  --libafl \
-		fuzz.o \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-clean:
-	rm ./$(FUZZER_NAME) || true
-	rm fuzz.o || true
-
-run: all
-	./$(FUZZER_NAME)
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	mkdir in || true
-	echo a > in/a
-	# Allow sigterm as exit code 
-	(timeout 11s ./$(FUZZER_NAME) -o out -i in || [ $$? -eq 124 ])
-	rm -rf out || true
-	rm -rf in || true
-
-test: all
-	mkdir in || true
-	echo a > in/a
-	(timeout 60s ./$(FUZZER_NAME) -o out -i in || [ $$? -eq 124 ])
-	rm -rf out || true
-	rm -rf in || true
diff --git a/fuzzers/generic_inmemory/Makefile b/fuzzers/generic_inmemory/Makefile
deleted file mode 100644
index 5fb91e93d0..0000000000
--- a/fuzzers/generic_inmemory/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-FUZZER_NAME="fuzzer"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-fuzzer: libafl_cc
-	target/release/libafl_cc -O3 fuzz.c -o $@
-
-clean:
-	rm ./$(FUZZER_NAME)
-
-run: all
-	./$(FUZZER_NAME) --cores 0 &
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	RUST_BACKTRACE=1 timeout 10s ./$(FUZZER_NAME) --cores 0 &
-
-test: all
-	RUST_BACKTRACE=1 timeout 60s ./$(FUZZER_NAME) --cores 0 &
diff --git a/fuzzers/libfuzzer_libmozjpeg/Makefile b/fuzzers/libfuzzer_libmozjpeg/Makefile
deleted file mode 100644
index 65d260cf23..0000000000
--- a/fuzzers/libfuzzer_libmozjpeg/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-FUZZER_NAME="fuzzer_mozjpeg"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-mozjpeg-4.0.3:
-	wget https://github.com/mozilla/mozjpeg/archive/v4.0.3.tar.gz
-	tar -xzvf v4.0.3.tar.gz
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-mozjpeg-4.0.3-compiled: mozjpeg-4.0.3 libafl_cc
-	cd mozjpeg-4.0.3 && cmake . -DENABLE_SHARED=false -DCMAKE_C_COMPILER=$(abspath $(PROJECT_DIR)/target/release/libafl_cc) -DCMAKE_CXX_COMPILER=$(abspath $(PROJECT_DIR)/target/release/libafl_cxx) -G "Unix Makefiles"
-	$(MAKE) -C mozjpeg-4.0.3
-	
-
-fuzzer: mozjpeg-4.0.3-compiled libafl_cxx
-	# Build the mozjpeg libfuzzer library
-	cargo build --release
-
-  # Build the mozjpeg harness	
-	target/release/libafl_cxx \
-		$(PROJECT_DIR)/harness.cc \
-		$(PROJECT_DIR)/mozjpeg-4.0.3/*.a \
-		-I$(PROJECT_DIR)/mozjpeg-4.0.3/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-clean:
-	rm ./$(FUZZER_NAME)
-	$(MAKE) -C mozjpeg-4.0.3 clean
-
-run: all
-	./$(FUZZER_NAME) &
-	sleep 0.2
-	./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-ifeq ($(UNAME), Darwin)
-short_test: libafl_cc
-	$(warning "Skipping build on MacOS as libpng in Github is ancient, see LibAFL GH issue #254")
-
-else
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 11s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 10s taskset -c 0 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 1 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 2 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 3 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-endif
-
-test: all
-	timeout 60s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 59s taskset 0x00000001 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000002 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000004 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000008 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000010 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000020 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000040 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000080 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000100 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000200 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000400 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000800 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00001000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00002000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00004000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00008000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00010000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00020000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00040000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00080000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00100000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00200000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00400000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00800000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x01000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x02000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x04000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x08000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x10000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x20000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x40000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x80000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
diff --git a/fuzzers/libfuzzer_libpng/Makefile b/fuzzers/libfuzzer_libpng/Makefile
deleted file mode 100644
index bce720ec93..0000000000
--- a/fuzzers/libfuzzer_libpng/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-FUZZER_NAME="fuzzer_libpng"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all libafl_cc libafl_cxx
-
-all: fuzzer
-
-libpng-1.6.37:
-	wget https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz
-	tar -xvf libpng-1.6.37.tar.xz
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-libpng-1.6.37/.libs/libpng16.a: libpng-1.6.37 libafl_cc
-	cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
-	$(MAKE) -C libpng-1.6.37 CC="$(PROJECT_DIR)/target/release/libafl_cc" CXX="$(PROJECT_DIR)/target/release/libafl_cxx"
-
-
-fuzzer: libpng-1.6.37/.libs/libpng16.a libafl_cxx
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-    # Build the libpng harness	
-	target/release/libafl_cxx \
-		$(PROJECT_DIR)/harness.cc \
-		$(PROJECT_DIR)/libpng-1.6.37/.libs/libpng16.a \
-		-I$(PROJECT_DIR)/libpng-1.6.37/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-clean:
-	$(MAKE) -C libpng-1.6.37 clean
-	rm ./$(FUZZER_NAME)
-
-run: all
-	./$(FUZZER_NAME) &
-	sleep 0.2
-	./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 11s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 10s taskset -c 0 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 1 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 2 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 3 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-test: all
-	timeout 60s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 59s taskset 0x00000001 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000002 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000004 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000008 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000010 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000020 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000040 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000080 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000100 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000200 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000400 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000800 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00001000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00002000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00004000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00008000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00010000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00020000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00040000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00080000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00100000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00200000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00400000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00800000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x01000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x02000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x04000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x08000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x10000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x20000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x40000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x80000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
diff --git a/fuzzers/libfuzzer_libpng_accounting/Makefile b/fuzzers/libfuzzer_libpng_accounting/Makefile
deleted file mode 100644
index e7ed9d10c5..0000000000
--- a/fuzzers/libfuzzer_libpng_accounting/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-FUZZER_NAME="fuzzer_libpng"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-libpng-1.6.37:
-	wget https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz
-	tar -xvf libpng-1.6.37.tar.xz
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-libpng-1.6.37/.libs/libpng16.a: libpng-1.6.37 libafl_cc
-	cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
-	$(MAKE) -C libpng-1.6.37 CC="$(PROJECT_DIR)/target/release/libafl_cc" CXX="$(PROJECT_DIR)/target/release/libafl_cxx"
-	
-
-fuzzer: libpng-1.6.37/.libs/libpng16.a libafl_cxx
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-	# Build the libpng harness	
-	target/release/libafl_cxx \
-		$(PROJECT_DIR)/harness.cc \
-		$(PROJECT_DIR)/libpng-1.6.37/.libs/libpng16.a \
-		-I$(PROJECT_DIR)/libpng-1.6.37/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-clean:
-	rm ./$(FUZZER_NAME)
-	$(MAKE) -C libpng-1.6.37 clean
-
-run: all
-	./$(FUZZER_NAME) --cores 0 --input ./corpus &
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 10s ./$(FUZZER_NAME) --cores 0 --input ./corpus &
-
-test: all
-	timeout 60s ./$(FUZZER_NAME) --cores 0 --input ./corpus &
diff --git a/fuzzers/libfuzzer_libpng_ctx/Makefile b/fuzzers/libfuzzer_libpng_ctx/Makefile
deleted file mode 100644
index e7ed9d10c5..0000000000
--- a/fuzzers/libfuzzer_libpng_ctx/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-FUZZER_NAME="fuzzer_libpng"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-libpng-1.6.37:
-	wget https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz
-	tar -xvf libpng-1.6.37.tar.xz
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-libpng-1.6.37/.libs/libpng16.a: libpng-1.6.37 libafl_cc
-	cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
-	$(MAKE) -C libpng-1.6.37 CC="$(PROJECT_DIR)/target/release/libafl_cc" CXX="$(PROJECT_DIR)/target/release/libafl_cxx"
-	
-
-fuzzer: libpng-1.6.37/.libs/libpng16.a libafl_cxx
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-	# Build the libpng harness	
-	target/release/libafl_cxx \
-		$(PROJECT_DIR)/harness.cc \
-		$(PROJECT_DIR)/libpng-1.6.37/.libs/libpng16.a \
-		-I$(PROJECT_DIR)/libpng-1.6.37/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-clean:
-	rm ./$(FUZZER_NAME)
-	$(MAKE) -C libpng-1.6.37 clean
-
-run: all
-	./$(FUZZER_NAME) --cores 0 --input ./corpus &
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 10s ./$(FUZZER_NAME) --cores 0 --input ./corpus &
-
-test: all
-	timeout 60s ./$(FUZZER_NAME) --cores 0 --input ./corpus &
diff --git a/fuzzers/libfuzzer_libpng_launcher/Makefile b/fuzzers/libfuzzer_libpng_launcher/Makefile
deleted file mode 100644
index ca0a514241..0000000000
--- a/fuzzers/libfuzzer_libpng_launcher/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-FUZZER_NAME="fuzzer_libpng"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-libpng-1.6.37:
-	wget https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz
-	tar -xvf libpng-1.6.37.tar.xz
-
-target/release/libafl_cxx: src/* src/bin/*
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-libpng-1.6.37/.libs/libpng16.a: libpng-1.6.37 libafl_cc
-	cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
-	$(MAKE) -C libpng-1.6.37 CC="$(PROJECT_DIR)/target/release/libafl_cc" CXX="$(PROJECT_DIR)/target/release/libafl_cxx"
-	
-
-fuzzer: libpng-1.6.37/.libs/libpng16.a libafl_cxx
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-	# Build the libpng harness	
-	target/release/libafl_cxx \
-		$(PROJECT_DIR)/harness.cc \
-		$(PROJECT_DIR)/libpng-1.6.37/.libs/libpng16.a \
-		-I$(PROJECT_DIR)/libpng-1.6.37/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-clean:
-	rm ./$(FUZZER_NAME)
-	$(MAKE) -C libpng-1.6.37 clean
-
-run: all
-	./$(FUZZER_NAME) --cores 0 &
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 10s ./$(FUZZER_NAME) --cores 0 &
-
-test: all
-	timeout 60s ./$(FUZZER_NAME) --cores 0 &
diff --git a/fuzzers/libfuzzer_stb_image/Makefile b/fuzzers/libfuzzer_stb_image/Makefile
deleted file mode 100644
index 88a8ed0d13..0000000000
--- a/fuzzers/libfuzzer_stb_image/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-FUZZER_NAME="libfuzzer_stb_image"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-
-PHONY: all
-
-all: fuzzer
-
-target/release/libafl_cxx: build.rs
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-fuzzer: libafl_cxx
-	# Build the libpng libfuzzer library
-	cargo build --release
-	cp $(PROJECT_DIR)/target/release/$(FUZZER_NAME) .
-
-clean:
-	rm ./$(FUZZER_NAME)
-
-run: all
-	./$(FUZZER_NAME) &
-	sleep 0.2
-	./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 11s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 10s taskset -c 0 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 1 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 2 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 3 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-test: all
-	timeout 60s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 59s taskset 0x00000001 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000002 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000004 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000008 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000010 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000020 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000040 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000080 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000100 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000200 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000400 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000800 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00001000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00002000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00004000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00008000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00010000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00020000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00040000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00080000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00100000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00200000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00400000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00800000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x01000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x02000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x04000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x08000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x10000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x20000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x40000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x80000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
diff --git a/fuzzers/libfuzzer_stb_image_sugar/Makefile b/fuzzers/libfuzzer_stb_image_sugar/Makefile
deleted file mode 100644
index 88a8ed0d13..0000000000
--- a/fuzzers/libfuzzer_stb_image_sugar/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-FUZZER_NAME="libfuzzer_stb_image"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-
-PHONY: all
-
-all: fuzzer
-
-target/release/libafl_cxx: build.rs
-	# Build the libpng libfuzzer library
-	cargo build --release
-
-libafl_cxx: target/release/libafl_cxx
-
-libafl_cc: target/release/libafl_cxx
-
-fuzzer: libafl_cxx
-	# Build the libpng libfuzzer library
-	cargo build --release
-	cp $(PROJECT_DIR)/target/release/$(FUZZER_NAME) .
-
-clean:
-	rm ./$(FUZZER_NAME)
-
-run: all
-	./$(FUZZER_NAME) &
-	sleep 0.2
-	./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 11s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 10s taskset -c 0 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 1 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 2 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 10s taskset -c 3 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-
-test: all
-	timeout 60s ./$(FUZZER_NAME) &
-	sleep 0.2
-	timeout 59s taskset 0x00000001 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000002 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000004 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	timeout 59s taskset 0x00000008 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000010 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000020 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000040 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000080 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000100 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000200 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000400 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00000800 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00001000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00002000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00004000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00008000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00010000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00020000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00040000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00080000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00100000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00200000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00400000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x00800000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x01000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x02000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x04000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x08000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x10000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x20000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x40000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
-	# timeout 59s taskset 0x80000000 ./$(FUZZER_NAME) >/dev/null 2>/dev/null &
diff --git a/fuzzers/qemu_launcher/Makefile b/fuzzers/qemu_launcher/Makefile
deleted file mode 100644
index 42f3d0f843..0000000000
--- a/fuzzers/qemu_launcher/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-FUZZER_NAME="libpng_harness"
-PROJECT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-UNAME := $(shell uname)
-
-PHONY: all
-
-all: fuzzer
-
-libpng-1.6.37:
-	wget https://deac-fra.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.xz
-	tar -xvf libpng-1.6.37.tar.xz
-
-target/release/qemu_launcher: src/*
-	cargo build --release
-
-libpng-1.6.37/.libs/libpng16.a: libpng-1.6.37
-	cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
-	$(MAKE) -C libpng-1.6.37
-	# Build the libpng harness	
-	c++ \
-		$(PROJECT_DIR)/harness.cc \
-		$(PROJECT_DIR)/libpng-1.6.37/.libs/libpng16.a \
-		-I$(PROJECT_DIR)/libpng-1.6.37/ \
-		-o $(FUZZER_NAME) \
-		-lm -lz
-
-fuzzer: target/release/qemu_launcher libpng-1.6.37/.libs/libpng16.a
-
-clean:
-	rm ./$(FUZZER_NAME)
-	$(MAKE) -C libpng-1.6.37 clean
-
-run: all
-	cargo run --release ./$(FUZZER_NAME)
-
-short_test: all
-	rm -rf libafl_unix_shmem_server || true
-	timeout 10s cargo run --release ./$(FUZZER_NAME) &
-
-test: all
-	timeout 60s cargo run --release ./$(FUZZER_NAME) &