More clean-up, removing now-unused (or now-complete) things.