Cleanup: make the vimrc easier to read + remove unused features