Maybe we could remove the dead code ?