more cleanup of cvs crap