CVS: remove references to 'cvs'