diff --git a/zsh/.zshrc b/zsh/.zshrc
index 80599c7..3395442 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -85,13 +85,19 @@ for env in $HOME/.okta/.env $HOME/.aws/.env $HOME/config/git/.env; do
   fi
 done
 
-autoload bashcompinit && bashcompinit
-autoload -Uz compinit
-compinit
+# command line completion
+autoload -U +X bashcompinit && bashcompinit
+autoload -Uz compinit && compinit
 
 # kubectl
 [[ $commands[kubectl] ]] && source <(kubectl completion zsh)
 
+# AWS CLI completion
+if command -v aws_completer > /dev/null; then
+  complete -C aws_completer aws
+fi
+
+
 # Highlight the current autocomplete option
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
 
@@ -109,13 +115,7 @@ fi
 
 zstyle :compinstall filename '~/.zshrc'
 
-if [[ -x /usr/bin/aws_completer ]]; then
-  complete -C '/usr/bin/aws_completer' aws
-fi
-
 #zstyle ':completion:*' completer _complete _ignored
 #zstyle :compinstall filename '~/.zshrc'
 
-autoload -U +X bashcompinit && bashcompinit
-autoload -Uz compinit
-compinit
+#compinit