Andre Hentschel : Get rid of some old dead code