Sync upgrades and cleanup