Cleanup in vimrc