Initial clean-up