CVS-related stuff should be removed