Partial clean-up.