diff --git a/qemu_mode/qemuafl b/qemu_mode/qemuafl
deleted file mode 160000
index 21ff3438..00000000
--- a/qemu_mode/qemuafl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 21ff34383764a8c6f66509b3b8d5282468c721e1
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 758b958b..e6a6718e 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -879,7 +879,7 @@ static void edit_params(u32 argc, char **argv, char **envp) {
 
 #ifndef __ANDROID__
 
-  if (compiler_mode != GCC) {
+  if (compiler_mode != GCC && compiler_mode != CLANG) {
 
     switch (bit_mode) {
 
diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl
deleted file mode 160000
index 8cca4801..00000000
--- a/unicorn_mode/unicornafl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8cca4801adb767dce7cf72202d7d25bdb420cf7d