some cvs stuff removed