Remove dead code, from Thomas Adam.