Re: clean-up after upgrade.