It looks like this is never used anywhere, can we please remove the dead code, it's distracting.