General clean-up.