diff --git a/README.md b/README.md
index cec0b7d4..617d9177 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ sudo apt update && sudo apt install git libssl-dev:i386 libc6-dev:i386 gdb libsd
 
 Arch gcc6 & dependencies installation:
 ```bash
-sudo pacman -Syu && sudo pacman -S gdb gdb-common glew1.10 lib32-glew1.10 rsync --noconfirm && yes | sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz
+sudo pacman -Syu && sudo pacman -S gdb gdb-common glew1.10 glew lib32-glew1.10 rsync --noconfirm && yes | sudo pacman -U https://archive.archlinux.org/packages/g/gcc-multilib/gcc-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/g/gcc-libs-multilib/gcc-libs-multilib-6.3.1-2-x86_64.pkg.tar.xz https://archive.archlinux.org/packages/l/lib32-gcc-libs/lib32-gcc-libs-6.3.1-2-x86_64.pkg.tar.xz
 ```
 
 If you don't use Ubuntu or Arch (or if Arch script gets outdated), here's the list of what cathook requires:
diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp
index 0fb64933..fec3fe61 100644
--- a/src/hacks/AntiAim.cpp
+++ b/src/hacks/AntiAim.cpp
@@ -161,15 +161,9 @@ void SetSafeSpace(int safespace) {
 bool ShouldAA(CUserCmd* cmd) {
 	if (!enabled) return false;
 	if (cmd->buttons & IN_USE) return false;
-	if (cmd->buttons & IN_ATTACK) {
-		IF_GAME (IsTF2()) {
-			if (g_pLocalPlayer->weapon()->m_iClassID == CL_CLASS(CTFCompoundBow)) {
-				goto i_dont_know_how_to_break_if;
-			}
-		}
-		if (CanShoot()) return false;
+	if ((cmd->buttons & IN_ATTACK) && !(IsTF2() && g_pLocalPlayer->weapon()->m_iClassID == CL_CLASS(CTFCompoundBow)) && CanShoot()) {
+		return false;
 	}
-	i_dont_know_how_to_break_if:
 	if ((cmd->buttons & IN_ATTACK2) && g_pLocalPlayer->weapon()->m_iClassID == CL_CLASS(CTFLunchBox)) return false;
 	switch (GetWeaponMode()) {
 	case weapon_projectile:
diff --git a/tf-settings/menu.json b/tf-settings/menu.json
index 3544ef01..94819e27 100644
--- a/tf-settings/menu.json
+++ b/tf-settings/menu.json
@@ -405,7 +405,6 @@
 		"name": "Miscellaneous",
 		"list": [
 			"events",
-			"chat_crypto",
 			"airstuck",
 			"instant_weapon_switch",
 			"name",