diff --git a/zshrc b/zshrc
index 708e396..905a3ec 100644
--- a/zshrc
+++ b/zshrc
@@ -59,6 +59,7 @@ export HISTFILE="$HOME/.zsh_history"
 export HISTSIZE=3000
 export SAVEHIST=$HISTSIZE
 export PATH="${HOME}/bin:$PATH"
+export GPG_TTY=$(tty)
 
 # Android SDK
 if [ -d ${HOME}/bin/android-sdk ]; then
@@ -71,10 +72,6 @@ if [ -d ${HOME}/bin/google-cloud-sdk ]; then
   source ${HOME}/bin/google-cloud-sdk/path.zsh.inc
 fi
 
-if [ -d ${HOME}/bin/YaTools ]; then
-  export PATH="${HOME}/bin/YaTools:${PATH}"
-fi
-
 # iTerm2 integration, only if detected as installed
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"