Cleanup after upstream sync