More clean-ups.