Clean up and start of upgrade.