Improved clean-up.