CVS cleanup