Remove Vimgrep and improve WS and CS handling