Various other changes for vim
Remove unused vim stuff