Let's do more clean-up.