Upgrade report cleanup