Remove/Improve vimrc