Real clean-up