Remove references to CVS
Remove the minus from the heredoc since tabs have been converted into spaces