Clean up dead code in recent commit.