Full clean-up