diff --git a/.gitignore b/.gitignore
index 68e354a..62901cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
 *.log
 *.pyc
 
-# Weechat
-weechat/logs/*
-weechat/weechat.log
 
 # Vim
 vim/.netrwhist
-vim/bundle/*
-!vim/bundle/vundle/*
+vim/plugged/*
diff --git a/.gitmodules b/.gitmodules
index aec4ca9..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "vim/bundle/Vundle.vim"]
-	path = vim/bundle/Vundle.vim
-	url = https://github.com/gmarik/Vundle.vim.git
diff --git a/symlinks.sh b/symlinks.sh
index d15dd11..8c2e83b 100644
--- a/symlinks.sh
+++ b/symlinks.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 rm ~/.ackrc; ln -s ~/dotfiles/ackrc ~/.ackrc
-rm -rf ~/.config/fish; mkdir -p ~/.config/fish; ln -s ~/dotfiles/config.fish ~/.config/fish/config.fish
 rm ~/.gemrc; ln -s ~/dotfiles/gemrc ~/.gemrc
 rm -rf ~/.ghc; mkdir ~/.ghc; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
 rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig
@@ -9,7 +8,6 @@ rm ~/.ruby-version; ln -s ~/dotfiles/ruby-version ~/.ruby-version
 rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
 rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
 rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim
-rm ~/.vimperatorrc; ln -s ~/dotfiles/vimperatorrc ~/.vimperatorrc
 rm -rf ~/.config/khal; mkdir -p ~/.config/khal; ln -s ~/dotfiles/khal.conf ~/.config/khal/khal.conf
 rm -rf ~/.vdirsyncer; mkdir ~/.vdirsyncer; ln -s ~/dotfiles/vdirsyncer/config ~/.vdirsyncer/config
 rm ~/.zshrc; ln -s ~/dotfiles/zshrc ~/.zshrc
@@ -19,13 +17,9 @@ rm ~/.gnupg/gpg-agent.conf; ln -s ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.c
 # Mail stuff
 rm ~/.offlineimaprc; ln -s ~/dotfiles/offlineimaprc ~/.offlineimaprc
 rm ~/.msmtprc; ln -s ~/dotfiles/msmtprc ~/.msmtprc
-rm -rf ~/.config/alot; ln -s ~/dotfiles/alot ~/.config/
-rm -rf ~/.config/afew; ln -s ~/dotfiles/afew ~/.config/
-rmdir ~/.mail/.notmuch/hooks; mkdir -p ~/.mail/.notmuch/hooks; ln -s ~/dotfiles/notmuch-post-new ~/.mail/.notmuch/hooks/post-new
 
 # TODO mac only
 rm ~/.slate.js; ln -s ~/dotfiles/slate.js ~/.slate.js
-rm ~/.urlview; ln -s ~/dotfiles/urlview.mac ~/.urlview
 rm ~/Library/KeyBindings/DefaultKeyBinding.dict; cp ~/dotfiles/DefaultKeyBinding.dict ~/Library/KeyBindings/DefaultKeyBinding.dict
 
 # TODO linux only
diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim
deleted file mode 160000
index 8db3bcb..0000000
--- a/vim/bundle/Vundle.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5