diff --git a/simpleDots/bash_profile b/simpleDots/bash_profile
index d8eab9e..6a7c0eb 100644
--- a/simpleDots/bash_profile
+++ b/simpleDots/bash_profile
@@ -1,11 +1,3 @@
-# Load the shell dotfiles, and then some:
-# * ~/.path can be used to extend `$PATH`.
-# * ~/.extra can be used for other settings you don’t want to commit.
-for file in ~/.{bash_prompt,aliases,functions,path,extra,exports}; do
-	[[ -r "$file" ]] && [[ -f "$file" ]] && source "$file"
-done
-unset file
-
 # Case-insensitive globbing (used in pathname expansion)
 #shopt -s nocaseglob
 
@@ -30,5 +22,13 @@ done
 	grep -v "[?*]" | cut -d " " -f2 | \
 	tr ' ' '\n')" scp sftp ssh
 
+# Load the shell dotfiles, and then some:
+# * ~/.path can be used to extend `$PATH`.
+# * ~/.extra can be used for other settings you don’t want to commit.
+for file in ~/.{bash_prompt,aliases,functions,path,extra,exports}; do
+	[[ -r "$file" ]] && [[ -f "$file" ]] && source "$file"
+done
+unset file
+
 # print a fortune when the terminal opens
 which fortune > /dev/null && which lolcat > /dev/null && fortune -a -s | lolcat
diff --git a/simpleDots/bashrc b/simpleDots/bashrc
index bf221e5..1e49157 100644
--- a/simpleDots/bashrc
+++ b/simpleDots/bashrc
@@ -96,5 +96,3 @@ if [[ -f $HOME/.bash_profile ]]; then
 fi
 
 cd $HOME
-
-test -f $HOME/.keychain/$HOSTNAME-sh && source $HOME/.keychain/$HOSTNAME-sh
diff --git a/simpleDots/functions b/simpleDots/functions
index 4630e5b..4e259cf 100644
--- a/simpleDots/functions
+++ b/simpleDots/functions
@@ -393,15 +393,6 @@ sslcheck(){
 	echo -n | openssl s_client -connect $* | tee /dev/tty | openssl x509 -text -noout
 }
 
-## SSH agent
-## Add sth like test -z $noKeychain && agent to ~/.extra
-function agent(){
-	/usr/bin/keychain --nolock --nogui $HOME/.ssh/id_rsa
-	source $HOME/.keychain/$HOSTNAME-sh
-}
-
-
-
 ## Kubernetes Goodies
 k(){
 	kubectl $*
diff --git a/simpleDots/i3/config b/simpleDots/i3/config
index 18ac116..3897e90 100644
--- a/simpleDots/i3/config
+++ b/simpleDots/i3/config
@@ -216,8 +216,8 @@ bindsym XF86Sleep exec "~/.bin/screenlock.sh"
 exec --no-startup-id xautolock -time 15 -locker "~/.bin/screenlock.sh" &
 
 # quick terminal
-bindsym $mod+$alt+Shift+F1 exec --no-startup-id noKeychain=1 $TERMINAL --class metask -e bash -o ignoreeof
-exec --no-startup-id noKeychain=1 $TERMINAL --class metask -e bash -o ignoreeof
+bindsym $mod+$alt+Shift+F1 exec --no-startup-id $TERMINAL --class metask -e bash -o ignoreeof
+exec --no-startup-id  $TERMINAL --class metask -e bash -o ignoreeof
 for_window [instance="metask"] floating enable;
 for_window [instance="metask"] move scratchpad; \
            [instance="metask"] scratchpad show; \