Tweak to remove dead code.