Remove old, dead code in last commit.