diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 69e4dbd..3a50043 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,7 +1,9 @@
-autoload -U compinit colors
+autoload -U bashcompinit compinit colors
+zmodload zsh/complist
 
 fpath=("$ZDOTDIR/completions" $fpath)
 compinit -d "$XDG_CACHE_HOME/.zcompdump-$ZSH_VERSION"
+bashcompinit
 
 colors
 
@@ -26,7 +28,6 @@ setopt HIST_IGNORE_DUPS
 setopt HIST_IGNORE_SPACE
 setopt SHARE_HISTORY
 
-################# TODO ################3
 export PAGER=less
 export LESS_TERMCAP_mb="${fg_bold[red]}"
 export LESS_TERMCAP_md="${fg_bold[red]}"
@@ -39,26 +40,11 @@ export LESS_TERMCAP_ue="${reset_color}"
 . <(dircolors)
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
 
-# fixme - the load process here seems a bit bizarre
-zmodload -i zsh/complist
-
-WORDCHARS=''
-
-# should this be in keybindings?
-bindkey -M menuselect '^o' accept-and-infer-next-history
 zstyle ':completion:*:*:*:*:*' menu select
-
 zstyle ':completion:*' matcher-list 'r:|=*' 'l:|=* r:|=*'
-
-# Complete . and .. special directories
-zstyle ':completion:*' special-dirs true
-
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 
 # disable named-directories autocompletion
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 
-# automatically load bash completion functions
-autoload -U +X bashcompinit && bashcompinit
-
 # vim: ft=zsh