Minor vimrc refactoring
Deleting some dead code