Final clean-ups.