Improved clean-up