André Hentschel : Replace some cvs stuff