clean-up after upgrade.