Initial clean-up.