cleanup and vim-vinegar