Quick clean-up