Other clean-up.