completion fiddling, rm vim-snippets, cleanup