Cleanup UpgradeHeaders, we may need an UpgradeState.